diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 20:25:59 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 20:25:59 +0900 |
| commit | 206a1a825dc67060ee319c99569755ba11250907 (patch) | |
| tree | e4cdbd7b8b745e0ad4adfd59fa57c3bcabe3daf4 /arch/arm/mach-s3c64xx/Makefile | |
| parent | 6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (diff) | |
| parent | 999304be1177d42d16bc59c546228c6ac5a3e76a (diff) | |
ARM: Merge for-2635-4/onenand
Merge branch 'for-2635-4/onenand' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/cpu.c
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s3c64xx/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index 39ef55e2655..9d1006938f5 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile @@ -62,3 +62,4 @@ obj-y += dev-uart.o obj-y += dev-audio.o obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o obj-$(CONFIG_S3C64XX_DEV_TS) += dev-ts.o +obj-$(CONFIG_S3C64XX_DEV_ONENAND1) += dev-onenand1.o |