diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 11:11:13 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 11:11:13 +0300 |
commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
tree | f59185b71c8059941de79143f71178453599b8f1 /arch/arm/mach-ns9xxx/gpio.c | |
parent | b3acf29afda06c76774dc6df6246c37ae707836b (diff) | |
parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
download | linux-36609469c8278554b046aa4cc9a5fa9ccea35306.tar.xz |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'arch/arm/mach-ns9xxx/gpio.c')
-rw-r--r-- | arch/arm/mach-ns9xxx/gpio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c index 5241e6a286cc..5503ca09c4ae 100644 --- a/arch/arm/mach-ns9xxx/gpio.c +++ b/arch/arm/mach-ns9xxx/gpio.c @@ -8,6 +8,7 @@ * under the terms of the GNU General Public License version 2 as published by * the Free Software Foundation. */ +#include <linux/kernel.h> #include <linux/compiler.h> #include <linux/init.h> #include <linux/spinlock.h> @@ -63,6 +64,7 @@ EXPORT_SYMBOL(gpio_request); void gpio_free(unsigned gpio) { + might_sleep(); clear_bit(gpio, gpiores); return; } |