Merge with /home/tmlind/src/kernel/linux-2.6

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc arch/arm/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/devices.c
Simple merge

diff --cc arch/arm/mach-omap1/mux.c
Simple merge

diff --cc arch/arm/mach-omap2/board-apollon.c
Simple merge

diff --cc arch/arm/mach-omap2/clock.c
Simple merge

diff --cc arch/arm/mach-omap2/mux.c
Simple merge

diff --cc arch/arm/mach-omap2/prcm.c
Simple merge

diff --cc arch/arm/plat-omap/common.c
Simple merge

diff --cc arch/arm/plat-omap/devices.c
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc arch/arm/plat-omap/sram.c
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/Kconfig
index ce10a6602078e3aef656373404d9becc5cce17fb,c40e487d9f5cd8a35475e4357800968eca3ba838..4ec6cf3a7f9db34554ea0998b6fa7f5541e13293
--- 1/drivers/char/Kconfig
--- 2/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -670,31 -687,8 +687,18 @@@ config NWFLAS
  
          If you're not sure, say N.
  
- config HW_RANDOM
-       tristate "Intel/AMD/VIA HW Random Number Generator support"
-       depends on (X86 || IA64) && PCI
-       ---help---
-         This driver provides kernel-side support for the Random Number
-         Generator hardware found on Intel i8xx-based motherboards,
-         AMD 76x-based motherboards, and Via Nehemiah CPUs.
- 
-         Provides a character driver, used to read() entropy data.
- 
-         To compile this driver as a module, choose M here: the
-         module will be called hw_random.
- 
-         If unsure, say N.
+ source "drivers/char/hw_random/Kconfig"
  
 +config OMAP_RNG
 +      tristate "OMAP Random Number Generator support"
 +      depends on ARCH_OMAP16XX || ARCH_OMAP24XX
 +      ---help---
 +        This driver provides kernel-side support for the Random Number
 +        Generator hardware found on OMAP16xx and OMAP24xx multimedia
 +        processors.
 +
 +        If unsure, say N.
 +
  config NVRAM
        tristate "/dev/nvram support"
        depends on ATARI || X86 || ARM || GENERIC_NVRAM

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

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

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

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

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

diff --cc drivers/net/irda/Kconfig
index add31991a2bd4a6e5ae678d0d006ef85eb2fb1a4,e9e6d99a9add263619e2278f756b59ab29709aa4..8929c5e7e8404bc97021baf3c86f27478b72769d
--- 1/drivers/net/irda/Kconfig
--- 2/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@@ -348,16 -348,9 +348,16 @@@ config TOSHIBA_FI
          To compile it as a module, choose M here: the module will be called
          donauboe.
  
 +config OMAP_IR
 +      tristate "OMAP IrDA(SIR/MIR/FIR)"
 +      depends on IRDA && (ARCH_OMAP1 || ARCH_OMAP2)
 +      select GPIOEXPANDER_OMAP if (MACH_OMAP_H3 || MACH_OMAP_H4)
 +        help
 +        Say Y here if you want to build support for the OMAP IR.
 +
  config AU1000_FIR
        tristate "Alchemy Au1000 SIR/FIR"
-       depends on MIPS_AU1000 && IRDA
+       depends on SOC_AU1000 && IRDA
  
  config SMC_IRCC_FIR
        tristate "SMSC IrCC (EXPERIMENTAL)"

diff --cc drivers/net/irda/Makefile
Simple merge

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

diff --cc drivers/net/smc91x.h
index 605863aa8a2a5baae5613894f3216bf6ed46e73b,4ec4b4d23ae5edc867113b8d27e4e638e1db25d4..00ace8aaccdde091d1dc61d5b1581b7084661aec
--- 1/drivers/net/smc91x.h
--- 2/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@@ -188,9 -206,8 +206,9 @@@ SMC_outw(u16 val, void __iomem *ioaddr
  #define       SMC_IRQ_FLAGS (( \
                   machine_is_omap_h2() \
                || machine_is_omap_h3() \
 +              || machine_is_omap_h4() \
                || (machine_is_omap_innovator() && !cpu_is_omap1510()) \
-       ) ? SA_TRIGGER_FALLING : SA_TRIGGER_RISING)
+       ) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING)
  
  
  #elif defined(CONFIG_SH_SH4202_MICRODEV)

diff --cc drivers/pcmcia/omap_cf.c
Simple merge

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

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

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

diff --cc drivers/video/Makefile
index acc05f62e76791e8cda904f9aa2f1ccd8a3571b5,481c6c9695f821da3bd133017bc4a9c3823046be..9948f1db5efd211cd4f162c37d27aec4df14e325
--- 1/drivers/video/Makefile
--- 2/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -97,9 -101,9 +101,10 @@@ obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pn
  
  # Platform or fallback drivers go here
  obj-$(CONFIG_FB_VESA)             += vesafb.o
+ obj-$(CONFIG_FB_IMAC)             += imacfb.o
  obj-$(CONFIG_FB_VGA16)            += vga16fb.o vgastate.o
  obj-$(CONFIG_FB_OF)               += offb.o
 +obj-$(CONFIG_FB_OMAP)           += omap/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
  
  # the test framebuffer is last
  obj-$(CONFIG_FB_VIRTUAL)          += vfb.o

diff --cc include/asm-arm/arch-omap/board.h
Simple merge

diff --cc include/asm-arm/arch-omap/hardware.h
Simple merge

diff --cc include/asm-arm/dma-mapping.h
index 73945b23dba118466016b47513bae0f238b1713b,55eb4dc3253ddfd1dea70d7900b2be0a1caa9ed9..04c4785b75f00b6e9d14e5c37959fb8107fa4382
--- 1/include/asm-arm/dma-mapping.h
--- 2/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@@ -3,9 -3,7 +3,8 @@@
  
  #ifdef __KERNEL__
  
- #include <linux/config.h>
  #include <linux/mm.h> /* need struct page */
 +#include <linux/device.h>
  
  #include <asm/scatterlist.h>
  

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

diff --cc include/linux/i2c-id.h
index c930ba739afaa51c767e1f6c30e8bc066f017df4,9418519a55d16e936cf593e472e953d294f68ea7..96e6d2d3d3f6d3812ec4452975ab1de0b0ff3c8d
--- 1/include/linux/i2c-id.h
--- 2/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@@ -112,9 -112,11 +112,13 @@@
  #define I2C_DRIVERID_X1205    82      /* Xicor/Intersil X1205 RTC     */
  #define I2C_DRIVERID_PCF8563  83      /* Philips PCF8563 RTC          */
  #define I2C_DRIVERID_RS5C372  84      /* Ricoh RS5C372 RTC            */
+ #define I2C_DRIVERID_BT866    85      /* Conexant bt866 video encoder */
+ #define I2C_DRIVERID_KS0127   86      /* Samsung ks0127 video decoder */
+ #define I2C_DRIVERID_TLV320AIC23B 87  /* TI TLV320AIC23B audio codec  */
+ #define I2C_DRIVERID_ISL1208  88      /* Intersil ISL1208 RTC         */
  
 +#define I2C_DRIVERID_MISC     99      /* Whatever until sorted out    */
 +
  #define I2C_DRIVERID_I2CDEV   900
  #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
  #define I2C_DRIVERID_ALERT      903    /* SMBus Alert Responder Client  */

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

diff --cc init/do_mounts.c
Simple merge

diff --cc net/ipv4/netfilter/Kconfig
Simple merge

diff --cc net/ipv4/netfilter/Makefile
Simple merge

diff --cc sound/oss/Kconfig
Simple merge