diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:40:24 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:40:24 +0900 |
| commit | 45c8fa878475b16467109cf6534af03b27e28d10 (patch) | |
| tree | a7c66c65dbc38774dcbba0d2965b1f851fcc1578 /arch/arm/mach-s5pv210/Makefile | |
| parent | 84eb9ecce20acfd287ba0d623fe5e99bfab08686 (diff) | |
| parent | ef2f07d31c6b890e0cc3966d4a27fa1d49b740f5 (diff) | |
| download | talos-op-linux-45c8fa878475b16467109cf6534af03b27e28d10.tar.gz talos-op-linux-45c8fa878475b16467109cf6534af03b27e28d10.zip | |
ARM: Merge for-2635-4/spi-devs
Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s5pv210/Makefile')
| -rw-r--r-- | arch/arm/mach-s5pv210/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile index 6c0cba8dfafa..6a6dea19dec5 100644 --- a/arch/arm/mach-s5pv210/Makefile +++ b/arch/arm/mach-s5pv210/Makefile @@ -25,6 +25,8 @@ obj-$(CONFIG_MACH_GONI) += mach-goni.o # device support obj-y += dev-audio.o +obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o + obj-$(CONFIG_S5PV210_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PV210_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PV210_SETUP_I2C2) += setup-i2c2.o |
