From: Tony Lindgren <tony@atomide.com>
Date: Wed, 16 May 2007 17:37:43 +0000 (-0700)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.22-omap1~152
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6a7bcae2d69a2e307472b84c1f588379f77eaa99;p=linux-2.6-omap-h63xx.git

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/io.c
	arch/arm/mach-omap2/pm.c
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/common.c
	drivers/Makefile
	drivers/i2c/Kconfig
	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/i2c/chips/twl4030_core.c
	drivers/media/video/Kconfig
	drivers/spi/Makefile
	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
---

6a7bcae2d69a2e307472b84c1f588379f77eaa99
diff --cc drivers/input/touchscreen/Kconfig
index 22cc23cc2ef,4f091800bfe..58fe796c0ea
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -164,20 -164,9 +164,21 @@@ 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"
+ 	depends on USB_ARCH_HAS_HCD
  	select USB
  	help
  	  USB Touchscreen driver for:
diff --cc drivers/media/video/Kconfig
index 653842ccd47,5cb3f54b548..bc56f1ab700
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -649,6 -654,6 +654,8 @@@ source "drivers/media/video/cx88/Kconfi
  
  source "drivers/media/video/ivtv/Kconfig"
  
++source drivers/media/video/omap/Kconfig
++
  config VIDEO_M32R_AR
  	tristate "AR devices"
  	depends on M32R && VIDEO_V4L1
diff --cc include/linux/i2c-id.h
index 90f5e067367,202cdaaee8c..6fd01d79dc4
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@@ -117,9 -117,10 +117,12 @@@
  #define I2C_DRIVERID_ISL1208	88	/* Intersil ISL1208 RTC		*/
  #define I2C_DRIVERID_WM8731		89	/* Wolfson WM8731 audio codec */
  #define I2C_DRIVERID_WM8750		90	/* Wolfson WM8750 audio codec */
+ #define I2C_DRIVERID_WM8753		91	/* Wolfson WM8753 audio codec */
+ 
+ #define I2C_DRIVERID_MISC	99	/* Whatever until sorted out	*/
  
 +#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  */