diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-03 11:48:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-03 11:48:39 +1100 |
| commit | 6fa3602bcdc1c419a313186d9039d5da85ef99d7 (patch) | |
| tree | c60b6a57285eb442079c01486f2aba88d483c314 /drivers | |
| parent | 32311ea656a64163b4d9b5f467f0e9a5a1c5fbad (diff) | |
| parent | 357d17723e59105f48f007b1bb364700a996cd45 (diff) | |
Merge remote-tracking branch 's5p/for-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/onenand/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/Kconfig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig index 4dbd0f58eebf..4f426195f8db 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/onenand/Kconfig @@ -32,7 +32,7 @@ config MTD_ONENAND_OMAP2 config MTD_ONENAND_SAMSUNG tristate "OneNAND on Samsung SOC controller support" - depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5PV310 + depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4 help Support for a OneNAND flash device connected to an Samsung SOC. S3C64XX/S5PC100 use command mapping method. diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index ef164f58120f..532cdd6fa6fc 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -537,8 +537,8 @@ config SERIAL_S3C6400 config SERIAL_S5PV210 tristate "Samsung S5PV210 Serial port support" - depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_S5PV310) - select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_S5PV310) + depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_EXYNOS4210) + select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210) default y help Serial port support for Samsung's S5P Family of SoC's |