diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /Documentation/arm/Interrupts | |
| parent | fece418418f51e92dd7e67e17c5e3fe5a28d3279 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'Documentation/arm/Interrupts')
| -rw-r--r-- | Documentation/arm/Interrupts | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Documentation/arm/Interrupts b/Documentation/arm/Interrupts index 0d3dbf1099bc..c202ed35d7d6 100644 --- a/Documentation/arm/Interrupts +++ b/Documentation/arm/Interrupts | |||
| @@ -138,14 +138,8 @@ So, what's changed? | |||
| 138 | 138 | ||
| 139 | Set active the IRQ edge(s)/level. This replaces the | 139 | Set active the IRQ edge(s)/level. This replaces the |
| 140 | SA1111 INTPOL manipulation, and the set_GPIO_IRQ_edge() | 140 | SA1111 INTPOL manipulation, and the set_GPIO_IRQ_edge() |
| 141 | function. Type should be one of the following: | 141 | function. Type should be one of IRQ_TYPE_xxx defined in |
| 142 | 142 | <linux/irq.h> | |
| 143 | #define IRQT_NOEDGE (0) | ||
| 144 | #define IRQT_RISING (__IRQT_RISEDGE) | ||
| 145 | #define IRQT_FALLING (__IRQT_FALEDGE) | ||
| 146 | #define IRQT_BOTHEDGE (__IRQT_RISEDGE|__IRQT_FALEDGE) | ||
| 147 | #define IRQT_LOW (__IRQT_LOWLVL) | ||
| 148 | #define IRQT_HIGH (__IRQT_HIGHLVL) | ||
| 149 | 143 | ||
| 150 | 3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type. | 144 | 3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type. |
| 151 | 145 | ||