x86: APIC/SMP: correct the message for "nosmp"

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

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e0b0580..e0c5f96 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -139,6 +139,30 @@ config FB_SYS_IMAGEBLIT
          blitting. This is used by drivers that don't provide their own
          (accelerated) version and the framebuffer is in system RAM.
 
          blitting. This is used by drivers that don't provide their own
          (accelerated) version and the framebuffer is in system RAM.
 

+menuconfig FB_FOREIGN_ENDIAN
+       bool "Framebuffer foreign endianness support"
+       depends on FB
+       ---help---
+         This menu will let you enable support for the framebuffers with
+         non-native endianness (e.g. Little-Endian framebuffer on a
+         Big-Endian machine). Most probably you don't have such hardware,
+         so it's safe to say "n" here.
+
+choice
+       prompt "Choice endianness support"
+       depends on FB_FOREIGN_ENDIAN
+
+config FB_BOTH_ENDIAN
+       bool "Support for Big- and Little-Endian framebuffers"
+
+config FB_BIG_ENDIAN
+       bool "Support for Big-Endian framebuffers only"
+
+config FB_LITTLE_ENDIAN
+       bool "Support for Little-Endian framebuffers only"
+
+endchoice
+

 config FB_SYS_FOPS
        tristate
        depends on FB
 config FB_SYS_FOPS
        tristate
        depends on FB


@@ -147,7 +171,16 @@ config FB_SYS_FOPS
 config FB_DEFERRED_IO
        bool
        depends on FB
 config FB_DEFERRED_IO
        bool
        depends on FB

-       default y
+
+config FB_METRONOME
+       tristate
+       depends on FB
+       depends on FB_DEFERRED_IO
+
+config FB_HECUBA
+       tristate
+       depends on FB
+       depends on FB_DEFERRED_IO

 
 config FB_SVGALIB
        tristate
 
 config FB_SVGALIB
        tristate


@@ -546,7 +579,7 @@ config FB_VGA16
 
 config FB_BF54X_LQ043
        tristate "SHARP LQ043 TFT LCD (BF548 EZKIT)"
 
 config FB_BF54X_LQ043
        tristate "SHARP LQ043 TFT LCD (BF548 EZKIT)"

-       depends on FB && (BF54x)
+       depends on FB && (BF54x) && !BF542

        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT


@@ -594,11 +627,9 @@ config FB_MAC
        select FB_CFB_IMAGEBLIT
        select FB_MACMODES
 
        select FB_CFB_IMAGEBLIT
        select FB_MACMODES
 

-#      bool '  Apple DAFB display support' CONFIG_FB_DAFB

 config FB_HP300
        bool
 config FB_HP300
        bool

-       depends on (FB = y) && HP300
-       select FB_CFB_FILLRECT
+       depends on (FB = y) && DIO

        select FB_CFB_IMAGEBLIT
        default y
 
        select FB_CFB_IMAGEBLIT
        default y
 


@@ -674,20 +705,18 @@ config FB_IMAC
        help
          This is the frame buffer device driver for the Intel-based Macintosh
 
        help
          This is the frame buffer device driver for the Intel-based Macintosh
 

-config FB_HECUBA
-       tristate "Hecuba board support"
+config FB_N411
+       tristate "N411 Apollo/Hecuba devkit support"

        depends on FB && X86 && MMU
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO
        depends on FB && X86 && MMU
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO

+       select FB_HECUBA

        help
        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 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.
+         This enables support for the Apollo display controller in its
+         Hecuba form using the n411 devkit.

 
 config FB_HGA
        tristate "Hercules mono graphics support"
 
 config FB_HGA
        tristate "Hercules mono graphics support"


@@ -1087,7 +1116,7 @@ config FB_CARILLO_RANCH
          This driver supports the LE80578 (Carillo Ranch) board
 
 config FB_INTEL
          This driver supports the LE80578 (Carillo Ranch) board
 
 config FB_INTEL

-       tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G support (EXPERIMENTAL)"
+       tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"

        depends on FB && EXPERIMENTAL && PCI && X86
        select AGP
        select AGP_INTEL
        depends on FB && EXPERIMENTAL && PCI && X86
        select AGP
        select AGP_INTEL


@@ -1097,7 +1126,7 @@ config FB_INTEL
        select FB_CFB_IMAGEBLIT
        help
          This driver supports the on-board graphics built in to the Intel
        select FB_CFB_IMAGEBLIT
        help
          This driver supports the on-board graphics built in to the Intel

-          830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM chipsets.
+          830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.

           Say Y if you have and plan to use such a board.
 
          If you say Y here and want DDC/I2C support you must first say Y to
           Say Y if you have and plan to use such a board.
 
          If you say Y here and want DDC/I2C support you must first say Y to


@@ -1742,6 +1771,11 @@ config FB_PXA
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config FB_PXA_SMARTPANEL
+       bool "PXA Smartpanel LCD support"
+       default n
+       depends on FB_PXA
+

 config FB_PXA_PARAMETERS
        bool "PXA LCD command line parameters"
        default n
 config FB_PXA_PARAMETERS
        bool "PXA LCD command line parameters"
        default n


@@ -1779,14 +1813,25 @@ config FB_MBX_DEBUG
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config FB_FSL_DIU
+       tristate "Freescale DIU framebuffer support"
+       depends on FB && FSL_SOC
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       select PPC_LIB_RHEAP
+       ---help---
+         Framebuffer driver for the Freescale SoC DIU
+

 config FB_W100
        tristate "W100 frame buffer support"
 config FB_W100
        tristate "W100 frame buffer support"

-       depends on FB && PXA_SHARPSL
+       depends on FB && ARCH_PXA

        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        ---help---
          Frame buffer driver for the w100 as found on the Sharp SL-Cxx series.
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        ---help---
          Frame buffer driver for the w100 as found on the Sharp SL-Cxx series.

+         It can also drive the w3220 chip found on iPAQ hx4700.

 
          This driver is also available as a module ( = code which can be
          inserted and removed from the running kernel whenever you want). The
 
          This driver is also available as a module ( = code which can be
          inserted and removed from the running kernel whenever you want). The


@@ -1893,6 +1938,19 @@ config FB_XILINX
          framebuffer. ML300 carries a 640*480 LCD display on the board,
          ML403 uses a standard DB15 VGA connector.
 
          framebuffer. ML300 carries a 640*480 LCD display on the board,
          ML403 uses a standard DB15 VGA connector.
 

+config FB_AM200EPD
+       tristate "AM-200 E-Ink EPD devkit support"
+       depends on FB && ARCH_PXA && MMU
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       select FB_DEFERRED_IO
+       select FB_METRONOME
+       help
+         This enables support for the Metronome display controller used on
+         the E-Ink AM-200 EPD devkit.
+

 config FB_VIRTUAL
        tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
        depends on FB
 config FB_VIRTUAL
        tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
        depends on FB


@@ -1916,6 +1974,20 @@ config FB_VIRTUAL
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config XEN_FBDEV_FRONTEND
+       tristate "Xen virtual frame buffer support"
+       depends on FB && XEN
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       select FB_DEFERRED_IO
+       default y
+       help
+         This driver implements the front-end of the Xen virtual
+         frame buffer driver.  It communicates with a back-end
+         in another domain.
+

 source "drivers/video/omap/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/omap/Kconfig"
 
 source "drivers/video/backlight/Kconfig"