diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 23:19:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 23:19:23 -0400 |
| commit | ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc (patch) | |
| tree | f2533f1c9e569249b579e9d2615ba4b772eedd70 /include | |
| parent | 9eed28679282238210ad5e80bb91df30fec6d7db (diff) | |
| parent | 64271c4d909a15bc588f053a739db2e6df336d7d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3902/1: Enable GPIO81-84 on PXA255
[ARM] Comment out missing configuration symbols
[ARM] 3898/1: corgi_bl fix module loading
[ARM] 3897/1: corgi_bl fix module compiling
[ARM] Fix breakage in 7281c248f797723f66244b7ecef204620f664648
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-pxa/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h index f3bc70eee35b..67ed43674c63 100644 --- a/include/asm-arm/arch-pxa/irqs.h +++ b/include/asm-arm/arch-pxa/irqs.h | |||
| @@ -73,7 +73,7 @@ | |||
| 73 | #define IRQ_TO_GPIO(i) (((i) < IRQ_GPIO(2)) ? ((i) - IRQ_GPIO0) : IRQ_TO_GPIO_2_x(i)) | 73 | #define IRQ_TO_GPIO(i) (((i) < IRQ_GPIO(2)) ? ((i) - IRQ_GPIO0) : IRQ_TO_GPIO_2_x(i)) |
| 74 | 74 | ||
| 75 | #if defined(CONFIG_PXA25x) | 75 | #if defined(CONFIG_PXA25x) |
| 76 | #define PXA_LAST_GPIO 80 | 76 | #define PXA_LAST_GPIO 84 |
| 77 | #elif defined(CONFIG_PXA27x) | 77 | #elif defined(CONFIG_PXA27x) |
| 78 | #define PXA_LAST_GPIO 127 | 78 | #define PXA_LAST_GPIO 127 |
| 79 | #endif | 79 | #endif |