From: Grant Likely Date: Mon, 27 Nov 2006 21:16:25 +0000 (-0700) Subject: [POWERPC] Move Efika support files into platforms/52xx X-Git-Tag: v2.6.20-rc2~6^2~13^2~13^2~24 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b9cf5d8e2edc503977be090eff45ef81555dcb1d;p=linux-2.6-omap-h63xx.git [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 Acked-by: Sylvain Munaut Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile index e1b02f1a189..1c9c122123d 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 similarity index 100% rename from arch/powerpc/platforms/efika/pci.c rename to arch/powerpc/platforms/52xx/efika-pci.c diff --git a/arch/powerpc/platforms/efika/setup.c b/arch/powerpc/platforms/52xx/efika-setup.c similarity index 100% rename from arch/powerpc/platforms/efika/setup.c rename to arch/powerpc/platforms/52xx/efika-setup.c diff --git a/arch/powerpc/platforms/efika/efika.h b/arch/powerpc/platforms/52xx/efika.h similarity index 100% rename from arch/powerpc/platforms/efika/efika.h rename to arch/powerpc/platforms/52xx/efika.h diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile index 468c5fdde93..44d95eaf22e 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 56d44044023..00000000000 --- a/arch/powerpc/platforms/efika/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += setup.o pci.o