Merged with ../linux-2.6

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/irq.c
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/char/Makefile
Simple merge

diff --cc drivers/char/watchdog/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/chips/isp1301_omap.c
Simple merge

diff --cc drivers/media/video/Kconfig
Simple merge

diff --cc drivers/media/video/Makefile
Simple merge

diff --cc drivers/mtd/maps/Kconfig
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/pcmcia/Kconfig
Simple merge

diff --cc drivers/pcmcia/Makefile
Simple merge

diff --cc drivers/serial/8250.c
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/host/ohci-omap.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/Makefile
Simple merge

diff --cc include/linux/fb.h
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc sound/oss/Kconfig
index 3f1e00fb66ad3e5aee0f8882605189adb86f42e1,7bd95ceab7cc62ab59339a4854dc0bc834b0eebd..1d5de4578a6d777710f544120fd6a1776ba93ba9
--- 1/sound/oss/Kconfig
--- 2/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@@ -4,36 -4,9 +4,36 @@@
  # More hacking for modularisation.
  #
  # Prompt user for primary drivers.
 +config SOUND_OMAP
 +      tristate "OMAP Sound Driver"
 +      depends on SOUND_PRIME!=n && SOUND && ARCH_OMAP
 +      ---help---
 +        OMAP Audio driver
 +
 +config SOUND_OMAP_TSC2101
 +      tristate "TSC2101 Stereo Codec"
 +      depends on SOUND_OMAP && ( MACH_OMAP_H2 || MACH_OMAP_H3 )
 +      select OMAP_TSC2101
 +      select OMAP_UWIRE if ARCH_OMAP
 +      ---help---
 +        Tsc2101 Audio Codec Driver for OMAP will be enabled.
 +        Will also Enable the following:
 +        1. uWire Driver based on Platform
 +        2. TSC2101 Glue driver
 +
 +config SOUND_OMAP_AIC23
 +      tristate "AIC23 Stereo Codec"
 +      depends on SOUND_OMAP && ( MACH_OMAP_INNOVATOR || MACH_OMAP_OSK )
 +      select OMAP_DSP if ARCH_OMAP
 +      select SENSORS_TLV320AIC23 if ARCH_OMAP
 +      ---help---
 +        AIC23 Audio Codec Driver for OMAP will be enabled.
 +        This will also enable OMAP DSP support because McBSP needed for
 +        this is a DSP peripheral. Additionally, AIC23 I2C support is enabled.
 +
  config SOUND_BT878
        tristate "BT878 audio dma"
-       depends on SOUND_PRIME!=n && SOUND
+       depends on SOUND_PRIME
        ---help---
          Audio DMA support for bt878 based grabber boards.  As you might have
          already noticed, bt878 is listed with two functions in /proc/pci.