mbxfb: fix incorrect argument type

[safe/jmp/linux-2.6] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 25c3903..758435f 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -5,8 +5,9 @@
 menu "Graphics support"
        depends on HAS_IOMEM
 
-source "drivers/video/backlight/Kconfig"
-source "drivers/video/display/Kconfig"
+source "drivers/char/agp/Kconfig"
+
+source "drivers/char/drm/Kconfig"
 
 config VGASTATE
        tristate
@@ -14,12 +15,11 @@ config VGASTATE
 
 config VIDEO_OUTPUT_CONTROL
        tristate "Lowlevel video output switch controls"
-       default m
        help
          This framework adds support for low-level control of the video 
          output switch.
 
-config FB
+menuconfig FB
        tristate "Support for frame buffer devices"
        ---help---
          The frame buffer device provides an abstraction for the graphics
@@ -503,7 +503,7 @@ config FB_VALKYRIE
 
 config FB_CT65550
        bool "Chips 65550 display support"
-       depends on (FB = y) && PPC32
+       depends on (FB = y) && PPC32 && PCI
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -544,6 +544,15 @@ config FB_VGA16
          To compile this driver as a module, choose M here: the
          module will be called vga16fb.
 
+config FB_BF54X_LQ043
+       tristate "SHARP LQ043 TFT LCD (BF548 EZKIT)"
+       depends on FB && (BF54x)
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+        This is the framebuffer device driver for a SHARP LQ043T1DG01 TFT LCD
+
 config FB_STI
        tristate "HP STI frame buffer device support"
        depends on FB && PARISC
@@ -632,6 +641,17 @@ config FB_VESA
          You will get a boot time penguin logo at no additional cost. Please
          read <file:Documentation/fb/vesafb.txt>. If unsure, say Y.
 
+config FB_EFI
+       bool "EFI-based Framebuffer Support"
+       depends on (FB = y) && X86
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         This is the EFI frame buffer device driver. If the firmware on
+         your platform is UEFI2.0, select Y to add support for
+         Graphics Output Protocol for early console messages to appear.
+
 config FB_IMAC
        bool "Intel-based Macintosh Framebuffer Support"
        depends on (FB = y) && X86 && EFI
@@ -652,7 +672,7 @@ config FB_HECUBA
        help
          This enables support for the Hecuba board. This driver was tested
          with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO
-         interface (8 bit data, 4 bit control). If you anticpate using
+         interface (8 bit data, 4 bit control). If you anticipate using
          this driver, say Y or M; otherwise say N. You must specify the
          GPIO IO address to be used for setting control and data.
 
@@ -806,7 +826,7 @@ config FB_XVR500
        help
          This is the framebuffer device for the Sun XVR-500 and similar
          graphics cards based upon the 3DLABS Wildcat chipset.  The driver
-         only works on sparc64 systems where the system firwmare has
+         only works on sparc64 systems where the system firmware has
          mostly initialized the card already.  It is treated as a
          completely dumb framebuffer device.
 
@@ -819,7 +839,7 @@ config FB_XVR2500
        help
          This is the framebuffer device for the Sun XVR-2500 and similar
          graphics cards based upon the 3DLABS Wildcat chipset.  The driver
-         only works on sparc64 systems where the system firwmare has
+         only works on sparc64 systems where the system firmware has
          mostly initialized the card already.  It is treated as a
          completely dumb framebuffer device.
 
@@ -869,7 +889,7 @@ config FB_S1D13XXX
 
 config FB_ATMEL
        tristate "AT91/AT32 LCD Controller support"
-       depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || AVR32)
+       depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || AVR32)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1500,7 +1520,7 @@ config FB_VOODOO1
 
          WARNING: Do not use any application that uses the 3D engine
          (namely glide) while using this driver.
-         Please read the <file:Documentation/fb/README-sstfb.txt> for supported
+         Please read the <file:Documentation/fb/sstfb.txt> for supported
          options and other important info  support.
 
 config FB_VT8623
@@ -1798,7 +1818,7 @@ config FB_SM501
          This driver is also available as a module ( = code which can be
          inserted and removed from the running kernel whenever you want). The
          module will be called sm501fb. If you want to compile it as a module,
-         say M here and read <file:Documentation/modules.txt>.
+         say M here and read <file:Documentation/kbuild/modules.txt>.
 
          If unsure, say N.
 
@@ -1883,9 +1903,10 @@ config FB_VIRTUAL
 
          If unsure, say N.
 
-if ARCH_OMAP
-       source "drivers/video/omap/Kconfig"
-endif
+source "drivers/video/omap/Kconfig"
+
+source "drivers/video/backlight/Kconfig"
+source "drivers/video/display/Kconfig"
 
 if VT
        source "drivers/video/console/Kconfig"
@@ -1896,4 +1917,3 @@ if FB || SGI_NEWPORT_CONSOLE
 endif
 
 endmenu
-