summaryrefslogtreecommitdiff
path: root/arch/arm/common/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-10 18:30:45 (GMT)
committerDavid S. Miller <davem@davemloft.net>2012-04-10 18:30:45 (GMT)
commit06eb4eafbdc0796d741d139a44f1253278da8611 (patch)
treefbdb44317130c371928154c9e6903e699fe2b995 /arch/arm/common/Makefile
parent32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff)
parentf68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff)
downloadlinux-fsl-qoriq-06eb4eafbdc0796d741d139a44f1253278da8611.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/common/Makefile')
-rw-r--r--arch/arm/common/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 6ea9b6f..215816f 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -5,11 +5,9 @@
obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_ARM_VIC) += vic.o
obj-$(CONFIG_ICST) += icst.o
-obj-$(CONFIG_PL330) += pl330.o
obj-$(CONFIG_SA1111) += sa1111.o
obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
obj-$(CONFIG_DMABOUNCE) += dmabounce.o
-obj-$(CONFIG_TIMER_ACORN) += time-acorn.o
obj-$(CONFIG_SHARP_LOCOMO) += locomo.o
obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o
obj-$(CONFIG_SHARP_SCOOP) += scoop.o