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

Commit 75d7b398 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 



tty: build fix for 3.3-rc6

This contains one build fix for the powerpc udbg driver that was reported.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

* tag 'tty-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty/powerpc: early udbg consoles can't be modules
parents a2e5f13c f21c6d4a

drivers/tty/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -365,7 +365,7 @@ config PPC_EPAPR_HV_BYTECHAN 




config PPC_EARLY_DEBUG_EHV_BC

config PPC_EARLY_DEBUG_EHV_BC

	bool "Early console (udbg) support for ePAPR hypervisors"

	bool "Early console (udbg) support for ePAPR hypervisors"

	depends on PPC_EPAPR_HV_BYTECHAN

	depends on PPC_EPAPR_HV_BYTECHAN=y

	help

	help

	  Select this option to enable early console (a.k.a. "udbg") support

	  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

	  via an ePAPR byte channel.  You also need to choose the byte channel