aboutsummaryrefslogtreecommitdiff
path: root/include/linux/amba
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-14 13:25:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-14 13:25:23 -0800
commitf5e4e20faa1eee3feaa0394897bbd1aca544e809 (patch)
tree047a93ff025c46ed97d3192a79f55b38fa071ca1 /include/linux/amba
parent4964e0664c80680fa6b28ef91381c076a5b25c2c (diff)
parentf408c985cefc9b1d99bc099e1208dd7df3445aa5 (diff)
downloadvexpress-lsk-f5e4e20faa1eee3feaa0394897bbd1aca544e809.tar.gz
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6
2nd round of GPIO changes for v3.3 merge window * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion gpio: pl061: remove combined interrupt gpio: pl061: convert to use generic irq chip GPIO: add bindings for managed devices ARM: realview: convert pl061 no irq to 0 instead of -1 gpio: pl061: convert to use 0 for no irq gpio: pl061: use chained_irq_* functions in irq handler GPIO/pl061: Add suspend resume capability drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap
Diffstat (limited to 'include/linux/amba')
-rw-r--r--include/linux/amba/pl061.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/amba/pl061.h b/include/linux/amba/pl061.h
index 2412af944f1..fb83c045348 100644
--- a/include/linux/amba/pl061.h
+++ b/include/linux/amba/pl061.h
@@ -7,7 +7,7 @@ struct pl061_platform_data {
unsigned gpio_base;
/* number of the first IRQ.
- * If the IRQ functionality in not desired this must be set to NO_IRQ.
+ * If the IRQ functionality in not desired this must be set to 0.
*/
unsigned irq_base;