diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /arch/arm/mach-ns9xxx/gpio.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'arch/arm/mach-ns9xxx/gpio.c')
| -rw-r--r-- | arch/arm/mach-ns9xxx/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c index b2230213b983..5286e9fc1d30 100644 --- a/arch/arm/mach-ns9xxx/gpio.c +++ b/arch/arm/mach-ns9xxx/gpio.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | static spinlock_t gpio_lock = __SPIN_LOCK_UNLOCKED(gpio_lock); | 31 | static spinlock_t gpio_lock = __SPIN_LOCK_UNLOCKED(gpio_lock); |
| 32 | 32 | ||
| 33 | /* only access gpiores with atomic ops */ | 33 | /* only access gpiores with atomic ops */ |
| 34 | static DECLARE_BITMAP(gpiores, GPIO_MAX); | 34 | static DECLARE_BITMAP(gpiores, GPIO_MAX + 1); |
| 35 | 35 | ||
| 36 | static inline int ns9xxx_valid_gpio(unsigned gpio) | 36 | static inline int ns9xxx_valid_gpio(unsigned gpio) |
| 37 | { | 37 | { |