Merge branches 'slab/cleanups', 'slab/failslab', 'slab/fixes' and 'slub/percpu' into...

[mv-sheeva.git] / arch / arm / plat-orion / Makefile

diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile
index 198f3dde2be3ddc745da4d22f9301acf065c1de7..56021a72e10ce340e7ada4d4e4270dd8854bab51 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