[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>
git-mirror · Dec 4, 2006 · b9cf5d8 · b9cf5d8
1 parent d415024
commit b9cf5d8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git 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 → arch/powerpc/platforms/52xx/efika-pci.c b/arch/powerpc/platforms/efika/pci.c → arch/powerpc/platforms/52xx/efika-pci.c
diff --git a/arch/powerpc/platforms/efika/setup.c → arch/powerpc/platforms/52xx/efika-setup.c b/arch/powerpc/platforms/efika/setup.c → arch/powerpc/platforms/52xx/efika-setup.c
diff --git a/arch/powerpc/platforms/efika/efika.h → arch/powerpc/platforms/52xx/efika.h b/arch/powerpc/platforms/efika/efika.h → arch/powerpc/platforms/52xx/efika.h
diff --git 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