diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 20:50:16 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 20:50:16 +0000 |
commit | 4788d72ce6c0d71220c06a242f935a056eccf424 (patch) | |
tree | 851ba5c54b4889b78b2a217c285e87c9e73536d3 /drivers/tty/Kconfig | |
parent | e594a97c8c74533ec105b2ac9194217e918f172f (diff) | |
parent | d39c815278bef7ce896100d8b385c81ed5cac015 (diff) | |
download | op-kernel-dev-4788d72ce6c0d71220c06a242f935a056eccf424.zip op-kernel-dev-4788d72ce6c0d71220c06a242f935a056eccf424.tar.gz |
Merge branch 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (201 commits)
gpio/samsung: use ioremap() for EXYNOS4 GPIOlib
gpio/samsung: add support GPIOlib for EXYNOS5250
ARM: EXYNOS: add support GPIO for EXYNOS5250
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
The dummy clock for the pxa rtc in those files keeps getting added and
removed in various trees. Apparently removing is the correct solution.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/tty/Kconfig')
-rw-r--r-- | drivers/tty/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index b3d1741..830cd62 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig @@ -365,7 +365,7 @@ config PPC_EPAPR_HV_BYTECHAN config PPC_EARLY_DEBUG_EHV_BC bool "Early console (udbg) support for ePAPR hypervisors" - depends on PPC_EPAPR_HV_BYTECHAN + depends on PPC_EPAPR_HV_BYTECHAN=y help Select this option to enable early console (a.k.a. "udbg") support via an ePAPR byte channel. You also need to choose the byte channel |