diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 05:52:01 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 05:52:43 -0500 |
| commit | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (patch) | |
| tree | 8960fa71eb73d0f1185e893192411cb873362738 /arch/arm/mach-iop13xx/Makefile | |
| parent | 3b0eb4a195a124567cd0dd6f700f8388def542c6 (diff) | |
| parent | 3668b45d46f777b0773ef5ff49531c1144efb6dd (diff) | |
[ARM] Merge remaining IOP code
Conflicts:
include/asm-arm/arch-at91rm9200/entry-macro.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop13xx/Makefile')
| -rw-r--r-- | arch/arm/mach-iop13xx/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/Makefile b/arch/arm/mach-iop13xx/Makefile index c3d6c08f2d4c..4185e0586c33 100644 --- a/arch/arm/mach-iop13xx/Makefile +++ b/arch/arm/mach-iop13xx/Makefile | |||
| @@ -5,7 +5,6 @@ obj- := | |||
| 5 | 5 | ||
| 6 | obj-$(CONFIG_ARCH_IOP13XX) += setup.o | 6 | obj-$(CONFIG_ARCH_IOP13XX) += setup.o |
| 7 | obj-$(CONFIG_ARCH_IOP13XX) += irq.o | 7 | obj-$(CONFIG_ARCH_IOP13XX) += irq.o |
| 8 | obj-$(CONFIG_ARCH_IOP13XX) += time.o | ||
| 9 | obj-$(CONFIG_ARCH_IOP13XX) += pci.o | 8 | obj-$(CONFIG_ARCH_IOP13XX) += pci.o |
| 10 | obj-$(CONFIG_ARCH_IOP13XX) += io.o | 9 | obj-$(CONFIG_ARCH_IOP13XX) += io.o |
| 11 | obj-$(CONFIG_MACH_IQ81340SC) += iq81340sc.o | 10 | obj-$(CONFIG_MACH_IQ81340SC) += iq81340sc.o |