Merged with mainline

diff --combined drivers/char/Kconfig
index be4d27dd17d0b5647a412488741f7f9e75a13f4c,4f27e5519296f9a2866e9b59ba49fc3001855bd2..24d609266058c36e844141e24fdd543aeeab789a
--- 1/drivers/char/Kconfig
--- 2/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -735,7 -735,7 +735,7 @@@ config SGI_IP27_RT
  
  config GEN_RTC
        tristate "Generic /dev/rtc emulation"
-       depends on RTC!=y && !IA64 && !ARM
+       depends on RTC!=y && !IA64 && !ARM && !PPC64
        ---help---
          If you say Y here and create a character special file /dev/rtc with
          major number 10 and minor number 135 using mknod ("man mknod"), you
@@@ -761,11 -761,6 +761,11 @@@ config GEN_RTC_
  config EFI_RTC
        bool "EFI Real Time Clock Services"
        depends on IA64
 +config OMAP_RTC
 +      bool "TI OMAP Real Time Clock"
 +      depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
 +      help
 +        Support for TI OMAP RTC
  
  config DS1302
        tristate "DS1302 RTC support"

diff --combined drivers/media/video/Kconfig
index 99ce2e5a4a62921489541e2341cfb4bd81b7950b,ac81e5e01a9a7b135a6aef6f155492c08333d4b2..8eef305ee489d4660849a0183c37616833e69ff5
--- 1/drivers/media/video/Kconfig
--- 2/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -236,7 -236,7 +236,7 @@@ config VIDEO_MEY
  
  config VIDEO_SAA7134
        tristate "Philips SAA7134 support"
-       depends on VIDEO_DEV && PCI && I2C
+       depends on VIDEO_DEV && PCI && I2C && SOUND
        select VIDEO_BUF
        select VIDEO_IR
        select VIDEO_TUNER
@@@ -331,7 -331,7 +331,7 @@@ config VIDEO_CX88_DV
        select DVB_MT352
        select DVB_OR51132
        select DVB_CX22702
-       select DVB_LGDT3302
+       select DVB_LGDT330X
        ---help---
          This adds support for DVB/ATSC cards based on the
          Connexant 2388x chip.
@@@ -361,10 -361,4 +361,10 @@@ config VIDEO_M32R_AR_M6427
          Say Y here to use the Renesas M64278E-800 camera module,
          which supports VGA(640x480 pixcels) size of images.
  
 +config VIDEO_OMAP_CAMERA
 +      tristate "OMAP Video for Linux camera driver"
 +      depends on VIDEO_DEV && ARCH_OMAP16XX
 +      select VIDEO_BUF
 +
 +
  endmenu

diff --combined drivers/video/Kconfig
index 3edfada00bfd6ac9624f74abd2b72ff70952b129,cde0ed097af689d626aac2d699069f7c71b5783b..33559438b685afb5b4c8b55bd0d7e33605d6551f
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -1399,8 -1399,8 +1399,8 @@@ config FB_TX391
          Say Y here to enable kernel support for the on-board framebuffer.
  
  config FB_G364
-       bool
-       depends on MIPS_MAGNUM_4000 || OLIVETTI_M700
+       bool "G364 frame buffer support"
+       depends on (FB = y) && (MIPS_MAGNUM_4000 || OLIVETTI_M700)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1484,48 -1484,6 +1484,48 @@@ config FB_S1D13XX
          working with S1D13806). Product specs at
          <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm>
  
 +config FB_OMAP
 +      tristate "OMAP frame buffer support (EXPERIMENTAL)"
 +        depends on FB && ARCH_OMAP1
 +      select FB_SOFT_CURSOR
 +        help
 +          This is the new frame buffer device driver with 2D acceleration
 +          for OMAP boards.
 +
 +config FB_OMAP_INTERNAL_LCDC
 +      bool "OMAP internal LCD controller support"
 +      depends on FB_OMAP
 +      default y
 +      help
 +        Say Y here, if you want to have support for the internal OMAP
 +        LCD controller. If unsure, say Y.
 +
 +config FB_OMAP_EXTERNAL_LCDC
 +      bool "OMAP external LCD controller support"
 +      depends on FB_OMAP
 +      help
 +        Say Y here, if you want to have support for boards with an
 +        external LCD controller connected to the SoSSI interface.
 +
 +config FB_OMAP_MANUAL_UPDATE
 +      bool "Default to manual update mode"
 +      depends on FB_OMAP_EXTERNAL_LCDC
 +      help
 +        Say Y here, if your user-space applications are capable of
 +        notifying the frame buffer driver when a change has occured in
 +          the frame buffer content and thus a reload of the image data is
 +          required. If unsure, say N.
 +
 +config FB_OMAP_DMA_TUNE
 +        bool "Set DMA SDRAM access priority high"
 +        depends on FB_OMAP
 +        help
 +          On systems in which video memory is in system memory
 +          (SDRAM) this will speed up graphics DMA operations.
 +          If you have such a system and want to use rotation
 +          answer yes. Answer no if you have a dedicated video
 +          memory, or don't use any of the accelerated features.
 +
  config FB_VIRTUAL
        tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
        depends on FB