Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core

[karo-tx-linux.git] / arch / arm / mach-orion5x / Makefile

diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile
index 3d4a1bc123551ca16dcf7e450b9c858b8c042122..edc38e2c856faf18ea0202364d86912c579632cd 100644 (file)
--- a/arch/arm/mach-orion5x/Makefile
+++ b/arch/arm/mach-orion5x/Makefile
@@ -1,4 +1,4 @@
-obj-y                          += common.o addr-map.o pci.o gpio.o irq.o mpp.o
+obj-y                          += common.o addr-map.o pci.o irq.o mpp.o
 obj-$(CONFIG_MACH_DB88F5281)   += db88f5281-setup.o
 obj-$(CONFIG_MACH_RD88F5182)   += rd88f5182-setup.o
 obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o