diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-27 09:30:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-27 09:30:52 -0700 |
commit | d96a2a5c6479342229416565944b56bc7a2b1a60 (patch) | |
tree | a17556ff042e739973decf0f4d1a21712e409520 /drivers/video/console/Kconfig | |
parent | 50c46637aa894f904e2fb39086a3d7732f68bd50 (diff) | |
parent | 81b4b98ae484f11d97b3d5b8e88d916b74055b78 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
[PARISC] Add NOTES section
[PARISC] Use compat_sys_getdents
[PARISC] Do not allow STI_CONSOLE to be modular
[PARISC] Clean up sti_flush
[PARISC] Add dummy isa_(bus|virt)_to_(virt|bus) inlines
[PARISC] Add empty <asm-parisc/vga.h>
Diffstat (limited to 'drivers/video/console/Kconfig')
-rw-r--r-- | drivers/video/console/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 49643969f9f..5db6b1e489b 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -145,7 +145,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION oriented. config STI_CONSOLE - tristate "STI text console" + bool "STI text console" depends on PARISC default y help |