[POWERPC] Move MPC52xx PIC driver into arch/powerpc/platforms/52xx

No other chips use this device, it belongs in a 52xx-specific path.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
new file mode 100644 (file)
index 0000000..e1b02f1
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for 52xx based boards
+#
+ifeq ($(CONFIG_PPC_MERGE),y)
+obj-y                          += mpc52xx_pic.o
+endif

diff --git a/arch/powerpc/sysdev/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
similarity index 100%
rename from arch/powerpc/sysdev/mpc52xx_pic.c
rename to arch/powerpc/platforms/52xx/mpc52xx_pic.c

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 52984a803e7c02f4caa94a98b628f0245a7df63f..468c5fdde935e69ce22ac759374a1c016e0e5c4e 100644 (file)
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -8,6 +8,7 @@ endif
 obj-$(CONFIG_PPC_EFIKA)                += efika/
 obj-$(CONFIG_PPC_CHRP)         += chrp/
 obj-$(CONFIG_4xx)              += 4xx/
+obj-$(CONFIG_PPC_MPC52xx)      += 52xx/
 obj-$(CONFIG_PPC_83xx)         += 83xx/
 obj-$(CONFIG_PPC_85xx)         += 85xx/
 obj-$(CONFIG_PPC_86xx)         += 86xx/

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index ee7c6d48af7fb6206166f7340b48eb85496615fa..6cc34597a620202e901927359bf9207664ffb0a8 100644 (file)
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_MTD)             += rom.o
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_I8259)                += i8259.o
 obj-$(CONFIG_PPC_83xx)         += ipic.o
-obj-$(CONFIG_PPC_MPC52xx)      += mpc52xx_pic.o
 endif
 
 # Temporary hack until we have migrated to asm-powerpc