diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-05 19:10:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-05 19:10:27 -0500 |
| commit | 75d7b398b74f86244fbb46ea9005438ae0aa33c8 (patch) | |
| tree | 9fe448e66084acdc2a100178932da5b448dbce46 /drivers | |
| parent | a2e5f13ce806e79b5a234f9653a2a245424e29fa (diff) | |
| parent | f21c6d4a49179f91fd70a41382382f08c780d425 (diff) | |
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
Diffstat (limited to 'drivers')
| -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 b3d17416d86a..830cd62d8492 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig | |||
| @@ -365,7 +365,7 @@ config PPC_EPAPR_HV_BYTECHAN | |||
| 365 | 365 | ||
| 366 | config PPC_EARLY_DEBUG_EHV_BC | 366 | config PPC_EARLY_DEBUG_EHV_BC |
| 367 | bool "Early console (udbg) support for ePAPR hypervisors" | 367 | bool "Early console (udbg) support for ePAPR hypervisors" |
| 368 | depends on PPC_EPAPR_HV_BYTECHAN | 368 | depends on PPC_EPAPR_HV_BYTECHAN=y |
| 369 | help | 369 | help |
| 370 | Select this option to enable early console (a.k.a. "udbg") support | 370 | Select this option to enable early console (a.k.a. "udbg") support |
| 371 | via an ePAPR byte channel. You also need to choose the byte channel | 371 | via an ePAPR byte channel. You also need to choose the byte channel |