diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 12:32:47 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 12:32:47 -0400 |
| commit | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (patch) | |
| tree | dcb8a23b0245d3d4d2719d7ea987f7eee608c553 /drivers | |
| parent | 9b963f32c38b4c7d2da667e4458967b550f30bee (diff) | |
| parent | b0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mm/Kconfig
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 | |||
| 32 | 32 | ||
| 33 | config MTD_ONENAND_SAMSUNG | 33 | config MTD_ONENAND_SAMSUNG |
| 34 | tristate "OneNAND on Samsung SOC controller support" | 34 | tristate "OneNAND on Samsung SOC controller support" |
| 35 | depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5PV310 | 35 | depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4 |
| 36 | help | 36 | help |
| 37 | Support for a OneNAND flash device connected to an Samsung SOC. | 37 | Support for a OneNAND flash device connected to an Samsung SOC. |
| 38 | S3C64XX/S5PC100 use command mapping method. | 38 | S3C64XX/S5PC100 use command mapping method. |
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 5c4b3475621f..aa9d3d11031d 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
| @@ -537,8 +537,8 @@ config SERIAL_S3C6400 | |||
| 537 | 537 | ||
| 538 | config SERIAL_S5PV210 | 538 | config SERIAL_S5PV210 |
| 539 | tristate "Samsung S5PV210 Serial port support" | 539 | tristate "Samsung S5PV210 Serial port support" |
| 540 | depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_S5PV310) | 540 | depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_EXYNOS4210) |
| 541 | select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_S5PV310) | 541 | select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210) |
| 542 | default y | 542 | default y |
| 543 | help | 543 | help |
| 544 | Serial port support for Samsung's S5P Family of SoC's | 544 | Serial port support for Samsung's S5P Family of SoC's |