diff options
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/touchscreen/tsc2005.c | 2 |
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 | ||
| 642 | config TOUCHSCREEN_TSC2005 | 642 | config 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 | ||
| 669 | err_remove_sysfs: | 669 | err_remove_sysfs: |
