Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --combined drivers/video/Kconfig
index e2126b5af1de1345215bcffe71aeff7c9ef2bcfd,f9916ca5ca4d44a7fcac405f8329678526445164..1d0aa5eb10b9bf0009aba9aefc67e90475fc7e3f
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -8,9 -8,6 +8,6 @@@ menu "Graphics support
  config HAVE_FB_ATMEL
        bool
  
- config HAVE_FB_IMX
-       bool
- 
  config SH_MIPI_DSI
        tristate
        depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
@@@ -359,7 -356,7 +356,7 @@@ config FB_SA110
  
  config FB_IMX
        tristate "Freescale i.MX LCD support"
-       depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
+       depends on FB && IMX_HAVE_PLATFORM_IMX_FB
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1463,14 -1460,6 +1460,14 @@@ config FB_S
        ---help---
          Driver for graphics boards with S3 Trio / S3 Virge chip.
  
 +config FB_S3_DDC
 +      bool "DDC for S3 support"
 +      depends on FB_S3
 +      select FB_DDC
 +      default y
 +      help
 +        Say Y here if you want DDC support for your S3 graphics card.
 +
  config FB_SAVAGE
        tristate "S3 Savage support"
        depends on FB && PCI && EXPERIMENTAL
@@@ -1570,6 -1559,17 +1567,17 @@@ config FB_VIA_DIRECT_PROCF
          correct output device configuration.
          Its use is strongly discouraged.
  
+ config FB_VIA_X_COMPATIBILITY
+       bool "X server compatibility"
+       depends on FB_VIA
+       default n
+       help
+         This option reduces the functionality (power saving, ...) of the
+         framebuffer to avoid negative impact on the OpenChrome X server.
+         If you use any X server other than fbdev you should enable this
+         otherwise it should be safe to disable it and allow using all
+         features.
+ 
  endif
  
  config FB_NEOMAGIC