Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cef9ab5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-driver' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 2e8a29a1 edeeec85

drivers/tty/serial/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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