Merge commit 'ftrace/function-graph' into next

[deliverable/linux.git] / arch / powerpc / platforms / 86xx / Makefile

diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 4a56ff619afdee7fc649c4e17203d73104f6d521..7c080da4523aa82e35fe5a68d031dd4fc41913ed 100644 (file)
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -7,4 +7,6 @@ obj-$(CONFIG_SMP)               += mpc86xx_smp.o
 obj-$(CONFIG_MPC8641_HPCN)     += mpc86xx_hpcn.o
 obj-$(CONFIG_SBC8641D)         += sbc8641d.o
 obj-$(CONFIG_MPC8610_HPCD)     += mpc8610_hpcd.o
-obj-$(CONFIG_GEF_SBC610)       += gef_sbc610.o gef_pic.o
+gef-gpio-$(CONFIG_GPIOLIB)     += gef_gpio.o
+obj-$(CONFIG_GEF_SBC610)       += gef_sbc610.o gef_pic.o $(gef-gpio-y)
+obj-$(CONFIG_GEF_SBC310)       += gef_sbc310.o gef_pic.o $(gef-gpio-y)