diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 13:25:21 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 13:25:21 +0100 |
| commit | 0cef9ab561c6d5c4e62252629709c38c573095d1 (patch) | |
| tree | f2877701118958db62e98da0b64efc66e9f2adc5 | |
| parent | 2e8a29a1c9aaa41f72a71bb81c3df66da8156c1e (diff) | |
| parent | edeeec85f7145fe8f2a5ffe250a8ee6b1fe4ab28 (diff) | |
Merge tag 'samsung-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
Pull "Samsung driver update for v3.19" from Kukjin Kim:
- Change samsung serial dependencies for exynos7 (ARMv8)
* tag 'samsung-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
serial: samsung: Fix serial config dependencies for exynos7
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/tty/serial/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 649b784081c7..98f8bcaf3e7e 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -249,14 +249,14 @@ config SERIAL_SAMSUNG config SERIAL_SAMSUNG_UARTS_4 bool - depends on PLAT_SAMSUNG + depends on SERIAL_SAMSUNG default y if !(CPU_S3C2410 || CPU_S3C2412 || CPU_S3C2440 || CPU_S3C2442) help Internal node for the common case of 4 Samsung compatible UARTs config SERIAL_SAMSUNG_UARTS int - depends on PLAT_SAMSUNG + depends on SERIAL_SAMSUNG default 4 if SERIAL_SAMSUNG_UARTS_4 || CPU_S3C2416 default 3 help |