Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[profile/ivi/kernel-adaptation-intel-automotive.git] / arch / arm / plat-orion / Makefile

diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile
index 198f3dd..56021a7 100644 (file)
--- a/arch/arm/plat-orion/Makefile
+++ b/arch/arm/plat-orion/Makefile
@@ -6,3 +6,5 @@ obj-y   := irq.o pcie.o time.o
 obj-m  :=
 obj-n  :=
 obj-   :=
+
+obj-$(CONFIG_GENERIC_GPIO) += gpio.o