diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 20:23:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 20:23:02 +0100 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/arm/mach-ks8695/include/mach/gpio.h | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/arm/mach-ks8695/include/mach/gpio.h')
| -rw-r--r-- | arch/arm/mach-ks8695/include/mach/gpio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/gpio.h b/arch/arm/mach-ks8695/include/mach/gpio.h index 73c84168761c..d4af5c335f16 100644 --- a/arch/arm/mach-ks8695/include/mach/gpio.h +++ b/arch/arm/mach-ks8695/include/mach/gpio.h @@ -11,6 +11,8 @@ #ifndef __ASM_ARCH_GPIO_H_ #define __ASM_ARCH_GPIO_H_ +#include <linux/kernel.h> + #define KS8695_GPIO_0 0 #define KS8695_GPIO_1 1 #define KS8695_GPIO_2 2 @@ -74,6 +76,7 @@ static inline int gpio_request(unsigned int pin, const char *label) static inline void gpio_free(unsigned int pin) { + might_sleep(); } #endif |