ARM: OMAP: Temporary patch to avoid merge conflicts

Temporary patch to avoid merge conflicts

diff --git a/drivers/Kconfig b/drivers/Kconfig
index be5e5fa6573c0baab6618f5e0e186c395640b046..aed4a9b97c1459adff1aafb111b4cee41a46b19b 100644 (file)
--- 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 95e7f757126197793ad2a03871688003ede522b6..c1838834ea7f0ac5ea147a724d985853a535ce49 100644 (file)
--- 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 825bf831db62a561ffe7a513b116bddc67683e3a..a0982da09803ed42c94fc6a37a119bc81b9dc75a 100644 (file)
--- 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 6c5fab66a48b973153afe1332fdb68e69e99fcab..b5e6d2f84f9777c3c43220e6675c9f6228f0e6e7 100644 (file)
--- 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 a9b06b8d8e3ff185ffbd9cb90ff00e1ee0528fc3..7089d86e857a6d0dbf62ad48742265fea34aa8f5 100644 (file)
--- 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)