aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/pca953x.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 12:14:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 12:14:41 -0700
commit8b29336fe01dab3541ebb283daddf9d0168c3f05 (patch)
treed64c1a3e00bf66c9ea9b50085f22662871cb5696 /drivers/gpio/pca953x.c
parent9f1912c48ce829d24789e3e5d499de0d44d3306a (diff)
parent1adb656e52e1159b0187bf6590df94c7ff44d389 (diff)
downloadkernel_samsung_espresso10-8b29336fe01dab3541ebb283daddf9d0168c3f05.zip
kernel_samsung_espresso10-8b29336fe01dab3541ebb283daddf9d0168c3f05.tar.gz
kernel_samsung_espresso10-8b29336fe01dab3541ebb283daddf9d0168c3f05.tar.bz2
Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6: gpio/via: rename VIA local config struct basic_mmio_gpio: split into a gpio library and platform device gpio: remove some legacy comments in build files gpio: add trace events for setting direction and value gpio/pca953x: Use handle_simple_irq instead of handle_edge_irq gpiolib: export gpiochip_find gpio: remove redundant Kconfig depends on GPIOLIB basic_mmio_gpio: convert to non-__raw* accessors basic_mmio_gpio: support direction registers basic_mmio_gpio: support different input/output registers basic_mmio_gpio: detect output method at probe time basic_mmio_gpio: request register regions basic_mmio_gpio: allow overriding number of gpio basic_mmio_gpio: convert to platform_{get,set}_drvdata() basic_mmio_gpio: remove runtime width/endianness evaluation
Diffstat (limited to 'drivers/gpio/pca953x.c')
-rw-r--r--drivers/gpio/pca953x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 7630ab7..78a8439 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -397,7 +397,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
irq_set_chip_data(irq, chip);
irq_set_chip_and_handler(irq, &pca953x_irq_chip,
- handle_edge_irq);
+ handle_simple_irq);
#ifdef CONFIG_ARM
set_irq_flags(irq, IRQF_VALID);
#else