[POWERPC] Move Efika support files into platforms/52xx

The Efika board isn't different enough from other 52xx based boards to
justify a separate platform.  This patch merges it with the support
code for all other 52xx based boards.

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

6 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
index e1b02f1a1891..1c9c122123d8 100644
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -4,3 +4,5 @@
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-y                           += mpc52xx_pic.o
 endif
+
+obj-$(CONFIG_PPC_EFIKA) += efika-setup.o efika-pci.o
diff --git a/arch/powerpc/platforms/efika/pci.c b/arch/powerpc/platforms/52xx/efika-pci.c
index 62e05b2a9227..62e05b2a9227 100644
--- a/arch/powerpc/platforms/efika/pci.c
+++ b/arch/powerpc/platforms/52xx/efika-pci.c
diff --git a/arch/powerpc/platforms/efika/setup.c b/arch/powerpc/platforms/52xx/efika-setup.c
index 110c980ed1e0..110c980ed1e0 100644
--- a/arch/powerpc/platforms/efika/setup.c
+++ b/arch/powerpc/platforms/52xx/efika-setup.c
diff --git a/arch/powerpc/platforms/efika/efika.h b/arch/powerpc/platforms/52xx/efika.h
index 2f060fd097d7..2f060fd097d7 100644
--- a/arch/powerpc/platforms/efika/efika.h
+++ b/arch/powerpc/platforms/52xx/efika.h
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 468c5fdde935..44d95eaf22e6 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -5,7 +5,6 @@ ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_PPC_PMAC)          += powermac/
 endif
 endif
-obj-$(CONFIG_PPC_EFIKA)         += efika/
 obj-$(CONFIG_PPC_CHRP)          += chrp/
 obj-$(CONFIG_4xx)               += 4xx/
 obj-$(CONFIG_PPC_MPC52xx)       += 52xx/
diff --git a/arch/powerpc/platforms/efika/Makefile b/arch/powerpc/platforms/efika/Makefile
deleted file mode 100644
index 56d440440236..000000000000
--- a/arch/powerpc/platforms/efika/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += setup.o pci.o