Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / touchscreen / tsc2005.c

diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index fa017996be78a95457de72e18774cf5cf5c6c283..7fb107ec69ef305bbba86465bc27d106826ed1e4 100644 (file)
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -30,7 +30,7 @@
 #include <linux/spi/spi.h>
 
 #ifdef CONFIG_ARCH_OMAP
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #endif
 
 #include <linux/spi/tsc2005.h>
@@ -661,11 +661,10 @@ err1:
 static int __devexit tsc2005_remove(struct spi_device *spi)
 {
        struct tsc2005 *ts = dev_get_drvdata(&spi->dev);
-       unsigned long flags;
 
-       spin_lock_irqsave(&ts->lock, flags);
+       mutex_lock(&ts->mutex);
        tsc2005_disable(ts);
-       spin_unlock_irqrestore(&ts->lock, flags);
+       mutex_unlock(&ts->mutex);
 
        device_remove_file(&ts->spi->dev, &dev_attr_disable_ts);
        device_remove_file(&ts->spi->dev, &dev_attr_pen_down);
@@ -734,4 +733,4 @@ module_exit(tsc2005_exit);
 
 MODULE_AUTHOR("Lauri Leukkunen <lauri.leukkunen@nokia.com>");
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("platform:tsc2005");