aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-05 16:10:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-05 16:10:27 -0800
commit75d7b398b74f86244fbb46ea9005438ae0aa33c8 (patch)
tree9fe448e66084acdc2a100178932da5b448dbce46
parenta2e5f13ce806e79b5a234f9653a2a245424e29fa (diff)
parentf21c6d4a49179f91fd70a41382382f08c780d425 (diff)
downloadlinux-msm-75d7b398b74f86244fbb46ea9005438ae0aa33c8.tar.gz
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: Greg 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
-rw-r--r--drivers/tty/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index b3d17416d86a39..830cd62d84925e 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