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/plat-samsung/Kconfig | |
| parent | 6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (diff) | |
| parent | 999304be1177d42d16bc59c546228c6ac5a3e76a (diff) | |
| download | blackbird-op-linux-206a1a825dc67060ee319c99569755ba11250907.tar.gz blackbird-op-linux-206a1a825dc67060ee319c99569755ba11250907.zip | |
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/plat-samsung/Kconfig')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 47c8aa75e747..d663078253de 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -201,6 +201,11 @@ config S3C_DEV_NAND help Compile in platform device definition for NAND controller +config S3C_DEV_ONENAND + bool + help + Compile in platform device definition for OneNAND controller + config S3C_DEV_RTC bool help |
