---

yaml --- r: 292575 b: refs/heads/master c: 44b24b7 h: refs/heads/master i: 292573: 292f1db 292571: a9c2b82 292567: 0344217 292559: cc547f6 292543: 4a79777 v: v3
git-mirror · Mar 16, 2012 · d42a2e9 · d42a2e9
1 parent b1643dc
commit d42a2e9
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6518bb69f463446a1552f52093cc699497f18fe0
+refs/heads/master: 44b24b74abc37e3c0f28c8288178056f10074863
diff --git a/trunk/arch/powerpc/platforms/86xx/Kconfig b/trunk/arch/powerpc/platforms/86xx/Kconfig
@@ -64,10 +64,6 @@ config GEF_SBC610
 	help
 	  This option enables support for the GE SBC610.
 
-config GE_FPGA
-	bool
-	default n
-
 endif
 
 config MPC8641

diff --git a/trunk/arch/powerpc/platforms/86xx/Makefile b/trunk/arch/powerpc/platforms/86xx/Makefile
@@ -7,7 +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_GE_FPGA)		+= gef_pic.o
 obj-$(CONFIG_GEF_SBC610)	+= gef_sbc610.o
 obj-$(CONFIG_GEF_SBC310)	+= gef_sbc310.o
 obj-$(CONFIG_GEF_PPC9A)		+= gef_ppc9a.o
diff --git a/trunk/arch/powerpc/platforms/86xx/gef_ppc9a.c b/trunk/arch/powerpc/platforms/86xx/gef_ppc9a.c
@@ -37,9 +37,9 @@
 
 #include <sysdev/fsl_pci.h>
 #include <sysdev/fsl_soc.h>
+#include <sysdev/ge/ge_pic.h>
 
 #include "mpc86xx.h"
-#include "gef_pic.h"
 
 #undef DEBUG
 

diff --git a/trunk/arch/powerpc/platforms/86xx/gef_sbc310.c b/trunk/arch/powerpc/platforms/86xx/gef_sbc310.c
@@ -37,9 +37,9 @@
 
 #include <sysdev/fsl_pci.h>
 #include <sysdev/fsl_soc.h>
+#include <sysdev/ge/ge_pic.h>
 
 #include "mpc86xx.h"
-#include "gef_pic.h"
 
 #undef DEBUG
 

diff --git a/trunk/arch/powerpc/platforms/86xx/gef_sbc610.c b/trunk/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -37,9 +37,9 @@
 
 #include <sysdev/fsl_pci.h>
 #include <sysdev/fsl_soc.h>
+#include <sysdev/ge/ge_pic.h>
 
 #include "mpc86xx.h"
-#include "gef_pic.h"
 
 #undef DEBUG
 

diff --git a/trunk/arch/powerpc/sysdev/Kconfig b/trunk/arch/powerpc/sysdev/Kconfig
@@ -29,3 +29,7 @@ config SCOM_DEBUGFS
 	bool "Expose SCOM controllers via debugfs"
 	depends on PPC_SCOM
 	default n
+
+config GE_FPGA
+	bool
+	default n
diff --git a/trunk/arch/powerpc/sysdev/Makefile b/trunk/arch/powerpc/sysdev/Makefile
@@ -65,3 +65,5 @@ obj-$(CONFIG_PPC_SCOM)		+= scom.o
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
 obj-$(CONFIG_PPC_XICS)		+= xics/
+
+obj-$(CONFIG_GE_FPGA)		+= ge/
diff --git a/trunk/arch/powerpc/sysdev/ge/Makefile b/trunk/arch/powerpc/sysdev/ge/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_GE_FPGA)		+= ge_pic.o
diff --git a/trunk/arch/powerpc/platforms/86xx/gef_pic.c → trunk/arch/powerpc/sysdev/ge/ge_pic.c b/trunk/arch/powerpc/platforms/86xx/gef_pic.c → trunk/arch/powerpc/sysdev/ge/ge_pic.c
@@ -22,7 +22,7 @@
 #include <asm/prom.h>
 #include <asm/irq.h>
 
-#include "gef_pic.h"
+#include "ge_pic.h"
 
 #define DEBUG
 #undef DEBUG

diff --git a/trunk/arch/powerpc/platforms/86xx/gef_pic.h → trunk/arch/powerpc/sysdev/ge/ge_pic.h b/trunk/arch/powerpc/platforms/86xx/gef_pic.h → trunk/arch/powerpc/sysdev/ge/ge_pic.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,3 +65,5 @@ obj-$(CONFIG_PPC_SCOM) += scom.o
		subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror

		obj-$(CONFIG_PPC_XICS) += xics/

		obj-$(CONFIG_GE_FPGA) += ge/