From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2005 14:01:01 +0000 (-0700)
Subject: ARM: OMAP: Temporary patch to avoid merge conflicts
X-Git-Tag: v2.6.13-omap1~96
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d1244aa95507c27ecd7660eaa62a535f2a1b24e2;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Temporary patch to avoid merge conflicts

Temporary patch to avoid merge conflicts
---

diff --git a/drivers/Kconfig b/drivers/Kconfig
index be5e5fa6573..aed4a9b97c1 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -60,6 +60,4 @@ source "drivers/infiniband/Kconfig"
 
 source "drivers/sn/Kconfig"
 
-source "drivers/ssi/Kconfig"
-
 endmenu
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index 95e7f757126..c1838834ea7 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -34,7 +34,6 @@ obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
-obj-$(CONFIG_OMAP16XX_WATCHDOG) += omap1610_wdt.o
 
 # Only one watchdog can succeed. We probe the hardware watchdog
 # drivers first, then the softdog driver.  This means if your hardware
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 825bf831db6..a0982da0980 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -509,19 +509,6 @@ config TPS65010
 	  This driver can also be built as a module.  If so, the module
 	  will be called tps65010.
 
-config SENSORS_TLV320AIC23
-	tristate "Texas Instruments TLV320AIC23 Codec"
-	depends on I2C && I2C_OMAP
-	help
-	  If you say yes here you get support for the I2C control
-	  interface for Texas Instruments TLV320AIC23 audio codec.
-
-config GPIOEXPANDER_OMAP
-	bool "GPIO Expander PCF8574PWR for OMAP"
-	depends on I2C && ARCH_OMAP16XX
-	help
-	  If you say yes here you get support for I/O expander calls
-	  to configure IrDA, Camera and audio devices endmenu
 
 config SENSORS_M41T00
 	tristate "ST M41T00 RTC chip"
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 6c5fab66a48..b5e6d2f84f9 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -49,8 +49,6 @@ 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
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index a9b06b8d8e3..7089d86e857 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -188,7 +188,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define	SMC_IRQ_TRIGGER_TYPE (( \
 		   machine_is_omap_h2() \
 		|| machine_is_omap_h3() \
-		|| (machine_is_omap_innovator() && !cpu_is_omap1510()) \
+		|| (machine_is_omap_innovator() && !cpu_is_omap150()) \
 	) ? IRQT_FALLING : IRQT_RISING)