diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/plat-iop/Makefile | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/plat-iop/Makefile')
| -rw-r--r-- | arch/arm/plat-iop/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-iop/Makefile b/arch/arm/plat-iop/Makefile index 69b09c1cec8b..90f7153a8d78 100644 --- a/arch/arm/plat-iop/Makefile +++ b/arch/arm/plat-iop/Makefile | |||
| @@ -10,7 +10,6 @@ obj-$(CONFIG_ARCH_IOP32X) += i2c.o | |||
| 10 | obj-$(CONFIG_ARCH_IOP32X) += pci.o | 10 | obj-$(CONFIG_ARCH_IOP32X) += pci.o |
| 11 | obj-$(CONFIG_ARCH_IOP32X) += setup.o | 11 | obj-$(CONFIG_ARCH_IOP32X) += setup.o |
| 12 | obj-$(CONFIG_ARCH_IOP32X) += time.o | 12 | obj-$(CONFIG_ARCH_IOP32X) += time.o |
| 13 | obj-$(CONFIG_ARCH_IOP32X) += io.o | ||
| 14 | obj-$(CONFIG_ARCH_IOP32X) += cp6.o | 13 | obj-$(CONFIG_ARCH_IOP32X) += cp6.o |
| 15 | obj-$(CONFIG_ARCH_IOP32X) += adma.o | 14 | obj-$(CONFIG_ARCH_IOP32X) += adma.o |
| 16 | obj-$(CONFIG_ARCH_IOP32X) += pmu.o | 15 | obj-$(CONFIG_ARCH_IOP32X) += pmu.o |
| @@ -21,7 +20,6 @@ obj-$(CONFIG_ARCH_IOP33X) += i2c.o | |||
| 21 | obj-$(CONFIG_ARCH_IOP33X) += pci.o | 20 | obj-$(CONFIG_ARCH_IOP33X) += pci.o |
| 22 | obj-$(CONFIG_ARCH_IOP33X) += setup.o | 21 | obj-$(CONFIG_ARCH_IOP33X) += setup.o |
| 23 | obj-$(CONFIG_ARCH_IOP33X) += time.o | 22 | obj-$(CONFIG_ARCH_IOP33X) += time.o |
| 24 | obj-$(CONFIG_ARCH_IOP33X) += io.o | ||
| 25 | obj-$(CONFIG_ARCH_IOP33X) += cp6.o | 23 | obj-$(CONFIG_ARCH_IOP33X) += cp6.o |
| 26 | obj-$(CONFIG_ARCH_IOP33X) += adma.o | 24 | obj-$(CONFIG_ARCH_IOP33X) += adma.o |
| 27 | obj-$(CONFIG_ARCH_IOP33X) += pmu.o | 25 | obj-$(CONFIG_ARCH_IOP33X) += pmu.o |