diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:01:00 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:01:00 -0500 |
| commit | a07613a54d700a974f3a4a657da78ef5d097315d (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/arm/mach-s5pc100/Makefile | |
| parent | 65db039bf7402f0a5b19cbf6dcff55ebea433b8b (diff) | |
| parent | 928a11ba36f999436915ea2b1eadf54301f93059 (diff) | |
Merge branch 'samsung/dt' into samsung/cleanup
Conflicts:
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pv210/Makefile
Pull in previously resolved conflicts:
The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s5pc100/Makefile')
| -rw-r--r-- | arch/arm/mach-s5pc100/Makefile | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile index 291e246c0ec0..118c711f74e8 100644 --- a/arch/arm/mach-s5pc100/Makefile +++ b/arch/arm/mach-s5pc100/Makefile | |||
| @@ -9,27 +9,24 @@ obj-m := | |||
| 9 | obj-n := | 9 | obj-n := |
| 10 | obj- := | 10 | obj- := |
| 11 | 11 | ||
| 12 | # Core support for S5PC100 system | 12 | # Core |
| 13 | 13 | ||
| 14 | obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o | 14 | obj-y += common.o clock.o |
| 15 | obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o | ||
| 16 | obj-$(CONFIG_CPU_S5PC100) += dma.o | ||
| 17 | 15 | ||
| 18 | # Helper and device support | 16 | obj-y += dma.o |
| 19 | |||
| 20 | obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o | ||
| 21 | obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o | ||
| 22 | obj-$(CONFIG_S5PC100_SETUP_IDE) += setup-ide.o | ||
| 23 | obj-$(CONFIG_S5PC100_SETUP_KEYPAD) += setup-keypad.o | ||
| 24 | obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | ||
| 25 | obj-$(CONFIG_S5PC100_SETUP_SPI) += setup-spi.o | ||
| 26 | |||
| 27 | # device support | ||
| 28 | obj-y += dev-audio.o | ||
| 29 | 17 | ||
| 30 | # machine support | 18 | # machine support |
| 31 | 19 | ||
| 32 | obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.o | 20 | obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.o |
| 33 | 21 | ||
| 34 | # device support | 22 | # device support |
| 23 | |||
| 35 | obj-y += dev-audio.o | 24 | obj-y += dev-audio.o |
| 25 | |||
| 26 | obj-y += setup-i2c0.o | ||
| 27 | obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o | ||
| 28 | obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o | ||
| 29 | obj-$(CONFIG_S5PC100_SETUP_IDE) += setup-ide.o | ||
| 30 | obj-$(CONFIG_S5PC100_SETUP_KEYPAD) += setup-keypad.o | ||
| 31 | obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | ||
| 32 | obj-$(CONFIG_S5PC100_SETUP_SPI) += setup-spi.o | ||