Selaa lähdekoodia

[PARISC] Allow STI_CONSOLE access to some FONTS

add || STI_CONSOLE to some of the basic FONTs. May need to get at
least one of them to default to "Y" for parisc.

Signed-off-by: Grant Grundler <grundler@parisc-linux.org>

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Grant Grundler 19 vuotta sitten
vanhempi
commit
b2c1fe81df
1 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 4 4
      drivers/video/console/Kconfig

+ 4 - 4
drivers/video/console/Kconfig

@@ -110,7 +110,7 @@ config STI_CONSOLE
 
 
 config FONTS
 config FONTS
 	bool "Select compiled-in fonts"
 	bool "Select compiled-in fonts"
-	depends on FRAMEBUFFER_CONSOLE
+	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
 	help
 	help
 	  Say Y here if you would like to use fonts other than the default
 	  Say Y here if you would like to use fonts other than the default
 	  your frame buffer console usually use.
 	  your frame buffer console usually use.
@@ -123,7 +123,7 @@ config FONTS
 
 
 config FONT_8x8
 config FONT_8x8
 	bool "VGA 8x8 font" if FONTS
 	bool "VGA 8x8 font" if FONTS
-	depends on FRAMEBUFFER_CONSOLE
+	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
 	default y if !SPARC32 && !SPARC64 && !FONTS
 	default y if !SPARC32 && !SPARC64 && !FONTS
 	help
 	help
 	  This is the "high resolution" font for the VGA frame buffer (the one
 	  This is the "high resolution" font for the VGA frame buffer (the one
@@ -137,7 +137,7 @@ config FONT_8x8
 
 
 config FONT_8x16
 config FONT_8x16
 	bool "VGA 8x16 font" if FONTS
 	bool "VGA 8x16 font" if FONTS
-	depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || USB_SISUSBVGA_CON
+	depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 
 	default y if !SPARC32 && !SPARC64 && !FONTS
 	default y if !SPARC32 && !SPARC64 && !FONTS
 	help
 	help
 	  This is the "high resolution" font for the VGA frame buffer (the one
 	  This is the "high resolution" font for the VGA frame buffer (the one
@@ -147,7 +147,7 @@ config FONT_8x16
 
 
 config FONT_6x11
 config FONT_6x11
 	bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
 	bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
-	depends on FRAMEBUFFER_CONSOLE
+	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
 	default y if !SPARC32 && !SPARC64 && !FONTS && MAC
 	default y if !SPARC32 && !SPARC64 && !FONTS && MAC
 	help
 	help
 	  Small console font with Macintosh-style high-half glyphs.  Some Mac
 	  Small console font with Macintosh-style high-half glyphs.  Some Mac