diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-28 15:00:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-28 15:00:48 +0100 |
| commit | 3bdae4f46445ea7cc9ee031d7ff106fdc6228669 (patch) | |
| tree | a44b445548dbf730535cfebd024e4cabadd4397c /arch/blackfin/kernel/bfin_gpio.c | |
| parent | 9f1e87ea3ecb3c46c21f6a1a202ec82f99ed2473 (diff) | |
| parent | 5f5db591326779a80cfe490c5d6b6ce9fac08b31 (diff) | |
| download | blackbird-op-linux-3bdae4f46445ea7cc9ee031d7ff106fdc6228669.tar.gz blackbird-op-linux-3bdae4f46445ea7cc9ee031d7ff106fdc6228669.zip | |
Merge branch 'x86/debug' into x86/irq
We merge this branch because x86/debug touches code that we started
cleaning up in x86/irq. The two branches started out independent,
but as unexpected amount of activity went into x86/irq, they became
dependent. Resolve that by this cross-merge.
Diffstat (limited to 'arch/blackfin/kernel/bfin_gpio.c')
| -rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 6e08f425bb44..5c0800adb4dd 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c @@ -218,7 +218,7 @@ inline int check_gpio(unsigned gpio) if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15 || gpio == GPIO_PH14 || gpio == GPIO_PH15 || gpio == GPIO_PJ14 || gpio == GPIO_PJ15 - || gpio > MAX_BLACKFIN_GPIOS) + || gpio >= MAX_BLACKFIN_GPIOS) return -EINVAL; return 0; } |
