diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-01-02 17:45:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-01-09 01:03:02 -0500 |
| commit | 9b3a6f4ab98809c93ac57fa5e11dff0575046efc (patch) | |
| tree | 8b2ced91e65430337cd204a2d082ac4abc1275f1 | |
| parent | a5b6ad6691763ee5eba46665d014d5abfe433df2 (diff) | |
[POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds
sysdev/rom.c is for arch/powerpc only. Don't compile it when building
an arch/ppc kernel.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 04d4917eb303..2621a7e72d2d 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile | |||
| @@ -12,7 +12,6 @@ obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o | |||
| 12 | obj-$(CONFIG_FSL_SOC) += fsl_soc.o | 12 | obj-$(CONFIG_FSL_SOC) += fsl_soc.o |
| 13 | obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o | 13 | obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o |
| 14 | obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ | 14 | obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ |
| 15 | obj-$(CONFIG_MTD) += rom.o | ||
| 16 | 15 | ||
| 17 | ifeq ($(CONFIG_PPC_MERGE),y) | 16 | ifeq ($(CONFIG_PPC_MERGE),y) |
| 18 | obj-$(CONFIG_PPC_I8259) += i8259.o | 17 | obj-$(CONFIG_PPC_I8259) += i8259.o |
| @@ -21,5 +20,6 @@ endif | |||
| 21 | 20 | ||
| 22 | # Temporary hack until we have migrated to asm-powerpc | 21 | # Temporary hack until we have migrated to asm-powerpc |
| 23 | ifeq ($(ARCH),powerpc) | 22 | ifeq ($(ARCH),powerpc) |
| 23 | obj-$(CONFIG_MTD) += rom.o | ||
| 24 | obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o | 24 | obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o |
| 25 | endif | 25 | endif |
