Pull bugzilla-7880 into release branch

[linux-2.6-omap-h63xx.git] / drivers / auxdisplay / Kconfig

diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index 0300e7f54cc4442e18d9d9966e5d8e7ddafe79bd..de2fcce10ba526c1eb0c32c788f978e9fe1172ee 100644 (file)
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -5,7 +5,11 @@
 # Auxiliary display drivers configuration.
 #
 
-menu "Auxiliary Display support"
+menuconfig AUXDISPLAY
+       depends on PARPORT
+       bool "Auxiliary Display support"
+
+if AUXDISPLAY && PARPORT
 
 config KS0108
        tristate "KS0108 LCD Controller"
@@ -67,6 +71,10 @@ config CFAG12864B
        depends on X86
        depends on FB
        depends on KS0108
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
        default n
        ---help---
          If you have a Crystalfontz 128x64 2-color LCD, cfag12864b Series,
@@ -106,4 +114,5 @@ config CFAG12864B_RATE
 
          If you compile this as a module, you can still override this
          value using the module parameters.
-endmenu
+
+endif # AUXDISPLAY