aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-03-21 05:37:07 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-24 02:49:17 -0400
commitddca6a31345cbea8c7c907e6b7e016339cbb6342 (patch)
tree9f9359112de6ff3623b0b63394f8343f1317c139 /drivers/input/touchscreen
parent97eb3f24352ec6632c2127b35d8087d2a809a9b9 (diff)
Input: tsc2005 - driver should depend on GENERIC_HARDIRQS
drivers/input/touchscreen/tsc2005.c: In function ‘tsc2005_probe’: drivers/input/touchscreen/tsc2005.c:666: error: implicit declaration of function ‘set_irq_wake’ In addition, migrate from set_irq_wake() (marked "do not use" as of commit a0cd9ca2b907d7ee26575e7b63ac92dad768a75e ("genirq: Namespace cleanup")) to irq_set_irq_wake(). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/Kconfig2
-rw-r--r--drivers/input/touchscreen/tsc2005.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 112ec55f2939..434fd800cd24 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -641,7 +641,7 @@ config TOUCHSCREEN_TOUCHIT213
641 641
642config TOUCHSCREEN_TSC2005 642config TOUCHSCREEN_TSC2005
643 tristate "TSC2005 based touchscreens" 643 tristate "TSC2005 based touchscreens"
644 depends on SPI_MASTER 644 depends on SPI_MASTER && GENERIC_HARDIRQS
645 help 645 help
646 Say Y here if you have a TSC2005 based touchscreen. 646 Say Y here if you have a TSC2005 based touchscreen.
647 647
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 87420616efa4..437b9cdddf82 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -663,7 +663,7 @@ static int __devinit tsc2005_probe(struct spi_device *spi)
663 goto err_remove_sysfs; 663 goto err_remove_sysfs;
664 } 664 }
665 665
666 set_irq_wake(spi->irq, 1); 666 irq_set_irq_wake(spi->irq, 1);
667 return 0; 667 return 0;
668 668
669err_remove_sysfs: 669err_remove_sysfs: