Merge omap-drivers

Merge branches 'master' and 'omap-drivers'

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n800-audio.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/pm.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	drivers/Makefile
	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/i2c/chips/gpio_expander_omap.c
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/i2c/chips/twl4030_core.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/spi/Kconfig
	drivers/spi/Makefile
	drivers/video/Kconfig
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/eac.h
	include/asm-arm/arch-omap/gpio.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/omap24xx.h
	include/asm-arm/arch-omap/onenand.h
	include/asm-arm/arch-omap/pm.h
	include/asm-arm/hardware/tsc2101.h
	net/ipv4/netfilter/Kconfig

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

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

diff --cc arch/arm/mach-omap2/io.c
index 9e660296e3e2c119bf86c34ad8215448e7284cea,2769171147bcfbe1edb51ad51d60742ba2548fb0..4f648c370f20309aada764eb91976b4cefb8c0b9
--- 1/arch/arm/mach-omap2/io.c
--- 2/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -4,7 -4,7 +4,7 @@@
   * OMAP2 I/O mapping code
   *
   * Copyright (C) 2005 Nokia Corporation
-- * Author: Juha Yrjölä <juha.yrjola@nokia.com>
++ * Author: Juha Yrjola<juha.yrjola@nokia.com>
   * Updated map desc to add 2430 support : <x0khasim@ti.com>
   *
   * This program is free software; you can redistribute it and/or modify

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
index 5d534bee3aa82296fcb35d8a6679f670463ff23f,5e640aeb03cdfa0ac1eb781c6232c6b3b117ff0c..22cc23cc2ef195407b8293958409d3682e2d404f
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -159,16 -164,58 +164,70 @@@ config TOUCHSCREEN_UCB140
          To compile this driver as a module, choose M here: the
          module will be called ucb1400_ts.
  
 +config TOUCHSCREEN_TSC2301
 +      tristate "TSC2301 touchscreen support"
 +      depends on SPI_TSC2301
 +      help
 +        Say Y here for if you are using the touchscreen features of TSC2301.
 +
 +config TOUCHSCREEN_TSC2046
 +      tristate "TSC2046 touchscreen support"
 +      default MACH_OMAP2430SDP
 +        help
 +        Say Y here for if you are using the touchscreen features of TSC2046
 +
+ config TOUCHSCREEN_USB_COMPOSITE
+       tristate "USB Touchscreen Driver"
+       select USB
+       help
+         USB Touchscreen driver for:
+         - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)
+         - PanJit TouchSet USB
+         - 3M MicroTouch USB (EX II series)
+         - ITM
+         - some other eTurboTouch
+         - Gunze AHL61
+         - DMC TSC-10/25
+ 
+         Have a look at <http://linux.chapter7.ch/touchkit/> for
+         a usage description and the required user-space stuff.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called usbtouchscreen.
+ 
+ config TOUCHSCREEN_USB_EGALAX
+       default y
+       bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+ 
+ config TOUCHSCREEN_USB_PANJIT
+       default y
+       bool "PanJit device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+ 
+ config TOUCHSCREEN_USB_3M
+       default y
+       bool "3M/Microtouch EX II series device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+ 
+ config TOUCHSCREEN_USB_ITM
+       default y
+       bool "ITM device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+ 
+ config TOUCHSCREEN_USB_ETURBO
+       default y
+       bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+ 
+ config TOUCHSCREEN_USB_GUNZE
+       default y
+       bool "Gunze AHL61 device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+ 
+ config TOUCHSCREEN_USB_DMC_TSC10
+       default y
+       bool "DMC TSC-10/25 device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+ 
  endif

diff --cc drivers/input/touchscreen/Makefile
Simple merge

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

diff --cc drivers/mtd/nand/Makefile
Simple merge

diff --cc drivers/usb/Kconfig
Simple merge

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

diff --cc drivers/video/backlight/Makefile
index 97ad8366f4f9b8bf210243b3c6db055b643d191b,c6e2266f63e2d6d7f728f196d31b65864d8699f5..4180388076f892052229f8bbe1a2f9e2c21daf74
--- 1/drivers/video/backlight/Makefile
--- 2/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@@ -5,5 -5,5 +5,6 @@@ obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) +
  obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o
  obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
  obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
 +obj-$(CONFIG_BACKLIGHT_OMAP)  += omap_bl.o
  obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
+ obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o

diff --cc include/asm-arm/pgtable.h
Simple merge

diff --cc kernel/printk.c
Simple merge