diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 10:08:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 10:08:13 -0700 |
commit | 91ec65ba335db80b686f93b9eb531d537e712e61 (patch) | |
tree | 462ab5101fa164ad84dae8afe5e220cc91f3ff29 /drivers/input/touchscreen/ad7877.c | |
parent | df42654e90b3045691f4c327075897aed9691ebe (diff) | |
parent | 0c387ec88abf4f1ddfe8c3be10ea981bc447b406 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ads7846 - fix unsafe disable_irq
Input: mainstone-wm97xx - fix condition in pen_up
Input: pc110pad - remove unused variable dev
Input: bf54x-keys - remove depreciated IRQF_SAMPLE_RANDOM flag
Input: ad7877, ad7879 - remove depreciated IRQF_SAMPLE_RANDOM flag
Input: da9034-ts - make pen {down,up} events more reliable
Input: da9034-ts - add Bin Yang as co-author of the driver
Input: atkbd - add forced release keys quirk for Samsung NC20
Input: atkbd - add forced release keys quirk for Samsung Q45
Input: gameport - fix attach driver code
Input: hp_sdc_rtc should depend on serio
Input: wm97xx - don't specify IRQF_SAMPLE_RANDOM
Input: ads7846 - introduce platform specific way to synchronize sampling
Input: remove unnecessary synchronize_rcu() call
Input: i8042 - add a DMI table for the i8042.reset option
Input: i8042 - introduce a tougher reset
Diffstat (limited to 'drivers/input/touchscreen/ad7877.c')
-rw-r--r-- | drivers/input/touchscreen/ad7877.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index e4728a28f49..ecaeb7e8e75 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c @@ -736,8 +736,8 @@ static int __devinit ad7877_probe(struct spi_device *spi) /* Request AD7877 /DAV GPIO interrupt */ - err = request_irq(spi->irq, ad7877_irq, IRQF_TRIGGER_FALLING | - IRQF_SAMPLE_RANDOM, spi->dev.driver->name, ts); + err = request_irq(spi->irq, ad7877_irq, IRQF_TRIGGER_FALLING, + spi->dev.driver->name, ts); if (err) { dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); goto err_free_mem; |