diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2006-11-27 16:16:25 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 04:41:39 -0500 |
| commit | b9cf5d8e2edc503977be090eff45ef81555dcb1d (patch) | |
| tree | b9f00c0f4dca73bd29f012a12163c1b69aa6e55f /arch/powerpc | |
| parent | d4150248fc769c7a69c61cb9d95dfac14950d8cf (diff) | |
[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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/52xx/Makefile | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/52xx/efika-pci.c (renamed from arch/powerpc/platforms/efika/pci.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/platforms/52xx/efika-setup.c (renamed from arch/powerpc/platforms/efika/setup.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/platforms/52xx/efika.h (renamed from arch/powerpc/platforms/efika/efika.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/platforms/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/efika/Makefile | 1 |
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 @@ | |||
| 4 | ifeq ($(CONFIG_PPC_MERGE),y) | 4 | ifeq ($(CONFIG_PPC_MERGE),y) |
| 5 | obj-y += mpc52xx_pic.o | 5 | obj-y += mpc52xx_pic.o |
| 6 | endif | 6 | endif |
| 7 | |||
| 8 | 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) | |||
| 5 | obj-$(CONFIG_PPC_PMAC) += powermac/ | 5 | obj-$(CONFIG_PPC_PMAC) += powermac/ |
| 6 | endif | 6 | endif |
| 7 | endif | 7 | endif |
| 8 | obj-$(CONFIG_PPC_EFIKA) += efika/ | ||
| 9 | obj-$(CONFIG_PPC_CHRP) += chrp/ | 8 | obj-$(CONFIG_PPC_CHRP) += chrp/ |
| 10 | obj-$(CONFIG_4xx) += 4xx/ | 9 | obj-$(CONFIG_4xx) += 4xx/ |
| 11 | obj-$(CONFIG_PPC_MPC52xx) += 52xx/ | 10 | 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 @@ | |||
| 1 | obj-y += setup.o pci.o | ||