diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/arm/mach-u300/Makefile | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-u300/Makefile')
| -rw-r--r-- | arch/arm/mach-u300/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/Makefile b/arch/arm/mach-u300/Makefile index 285538124e5e..fd3a5c382f47 100644 --- a/arch/arm/mach-u300/Makefile +++ b/arch/arm/mach-u300/Makefile | |||
| @@ -8,7 +8,6 @@ obj-n := | |||
| 8 | obj- := | 8 | obj- := |
| 9 | 9 | ||
| 10 | obj-$(CONFIG_ARCH_U300) += u300.o | 10 | obj-$(CONFIG_ARCH_U300) += u300.o |
| 11 | obj-$(CONFIG_MMC) += mmc.o | ||
| 12 | obj-$(CONFIG_SPI_PL022) += spi.o | 11 | obj-$(CONFIG_SPI_PL022) += spi.o |
| 13 | obj-$(CONFIG_MACH_U300_SPIDUMMY) += dummyspichip.o | 12 | obj-$(CONFIG_MACH_U300_SPIDUMMY) += dummyspichip.o |
| 14 | obj-$(CONFIG_I2C_STU300) += i2c.o | 13 | obj-$(CONFIG_I2C_STU300) += i2c.o |