2 files changed, 11 insertions, 3 deletions

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 8d6599d54ea6..abe2c4fff811 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -39,6 +39,7 @@ config GEF_PPC9A
         select MMIO_NVRAM
         select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
+        select GE_FPGA
         help
           This option enables support for the GE PPC9A.
 
@@ -48,6 +49,7 @@ config GEF_SBC310
         select MMIO_NVRAM
         select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
+        select GE_FPGA
         help
           This option enables support for the GE SBC310.
 
@@ -57,10 +59,15 @@ config GEF_SBC610
         select MMIO_NVRAM
         select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
+        select GE_FPGA
         select HAS_RAPIDIO
         help
           This option enables support for the GE SBC610.
 
+config GE_FPGA
+        bool
+        default n
+
 endif
 
 config MPC8641
diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 4b0d7b1aa005..ac6a50fdd1d1 100644
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o
 obj-$(CONFIG_SBC8641D)          += sbc8641d.o
 obj-$(CONFIG_MPC8610_HPCD)      += mpc8610_hpcd.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)
-obj-$(CONFIG_GEF_PPC9A)         += gef_ppc9a.o gef_pic.o $(gef-gpio-y)
+obj-$(CONFIG_GE_FPGA)   += gef_pic.o $(gef-gpio-y)
+obj-$(CONFIG_GEF_SBC610)        += gef_sbc610.o
+obj-$(CONFIG_GEF_SBC310)        += gef_sbc310.o
+obj-$(CONFIG_GEF_PPC9A)         += gef_ppc9a.o