diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 20:54:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 20:54:12 -0700 |
| commit | bbe5a96f678efcad83de8f900ab4ab963a99c805 (patch) | |
| tree | d1e03c52bc7d16c1ac9f41503b27da2f4b6b781d /drivers/video/console/Kconfig | |
| parent | f205ce83a766c08965ec78342f138cdc00631fba (diff) | |
| parent | 0a375d75902c522ea36c6dc409296622f93db4a7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Update defconfigs.
sparc: Kill PROM console driver.
Diffstat (limited to 'drivers/video/console/Kconfig')
| -rw-r--r-- | drivers/video/console/Kconfig | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 2f50a80b413..fc7d9bbb548 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -67,16 +67,9 @@ config SGI_NEWPORT_CONSOLE # bool 'IODC console' CONFIG_IODC_CONSOLE -config PROM_CONSOLE - bool "PROM console" - depends on SPARC - help - Say Y to build a console driver for Sun machines that uses the - terminal emulation built into their console PROMS. - config DUMMY_CONSOLE bool - depends on PROM_CONSOLE!=y || VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y + depends on VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y default y config DUMMY_CONSOLE_COLUMNS |