diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-02 02:44:11 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-08-04 13:18:17 +1000 |
| commit | 9c4cb82515130c62224e23fdf7c13c8f6c59c614 (patch) | |
| tree | f916fd843972502d918a1a03bdb99c9c2bbaa91c /arch/powerpc/sysdev | |
| parent | c7c8eede2739289df02a1ab297cc476c6f38dca7 (diff) | |
| download | lwn-9c4cb82515130c62224e23fdf7c13c8f6c59c614.tar.gz lwn-9c4cb82515130c62224e23fdf7c13c8f6c59c614.zip | |
powerpc: Remove use of CONFIG_PPC_MERGE
Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove
the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc
and include/asm-powerpc.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 16a0ed28eb00..a90054b56d5c 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -25,7 +25,6 @@ obj-$(CONFIG_MV64X60) += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \ obj-$(CONFIG_RTC_DRV_CMOS) += rtc_cmos_setup.o obj-$(CONFIG_AXON_RAM) += axonram.o -ifeq ($(CONFIG_PPC_MERGE),y) obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o obj-$(CONFIG_PPC_I8259) += i8259.o obj-$(CONFIG_IPIC) += ipic.o @@ -36,7 +35,6 @@ obj-$(CONFIG_OF_RTC) += of_rtc.o ifeq ($(CONFIG_PCI),y) obj-$(CONFIG_4xx) += ppc4xx_pci.o endif -endif # Temporary hack until we have migrated to asm-powerpc ifeq ($(ARCH),powerpc) |