From: Tony Lindgren <tony@atomide.com>
Date: Thu, 28 Jul 2005 09:11:35 +0000 (-0700)
Subject: Merge with mainline
X-Git-Tag: v2.6.13-omap1~44
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=05715197e960ebfe966efdbbae4ebb7e5225048e;p=linux-2.6-omap-h63xx.git

Merge with mainline
---

05715197e960ebfe966efdbbae4ebb7e5225048e
diff --cc drivers/Makefile
index 5e594afa85f,126a851d565..580fae71f36
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -52,7 -50,9 +52,8 @@@ obj-$(CONFIG_USB_GADGET)	+= usb/gadget
  obj-$(CONFIG_GAMEPORT)		+= input/gameport/
  obj-$(CONFIG_INPUT)		+= input/
  obj-$(CONFIG_I2O)		+= message/
 -obj-$(CONFIG_I2C)		+= i2c/
  obj-$(CONFIG_W1)		+= w1/
+ obj-$(CONFIG_HWMON)		+= hwmon/
  obj-$(CONFIG_PHONE)		+= telephony/
  obj-$(CONFIG_MD)		+= md/
  obj-$(CONFIG_BT)		+= bluetooth/
diff --cc drivers/i2c/chips/Makefile
index 6c5fab66a48,a876dd42b86..c60a38e588b
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@@ -40,17 -11,8 +11,10 @@@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca953
  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
  obj-$(CONFIG_SENSORS_RTC8564)	+= rtc8564.o
- obj-$(CONFIG_SENSORS_SIS5595)	+= sis5595.o
- obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
- obj-$(CONFIG_SENSORS_SMSC47M1)	+= smsc47m1.o
- obj-$(CONFIG_SENSORS_VIA686A)	+= via686a.o
- obj-$(CONFIG_SENSORS_W83627EHF)	+= w83627ehf.o
- obj-$(CONFIG_SENSORS_W83L785TS)	+= w83l785ts.o
- 
  obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
  obj-$(CONFIG_TPS65010)		+= tps65010.o
 +obj-$(CONFIG_SENSORS_TLV320AIC23) += tlv320aic23.o
 +obj-$(CONFIG_GPIOEXPANDER_OMAP)	+= gpio_expander_omap.o
  
  ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
  EXTRA_CFLAGS += -DDEBUG