diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 16:16:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 16:16:39 -0700 |
| commit | 7105212bd309752b589a3ba816afdd7fed190b85 (patch) | |
| tree | 812d86441f8ba375f04c38c569908bd3f61e1c26 /arch/arm/mach-ks8695/include/mach/gpio.h | |
| parent | 65fc716fa673cf98fb5887180fd3c52ca0371198 (diff) | |
| parent | b73b925a6b9d69478c6ae4e74ef20607fd24aeaa (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5326/1: AFEB9260: Fix for i2c_board_info structure
[ARM] mx31ads: Add missing include
[ARM] MXC: Fix mxc_gpio_get(), which must read PSR register instead DR.
[ARM] MX3: Use ioremap wrapper to map SoC devices nonshared
[ARM] gpio_free might sleep, arm architecture
[ARM] ep93xx: fix OHCI DMA mask
leds: da903x: (da9030 only) led brightness reversed.
[ARM] sharpsl_pm: fix compilation w/o CONFIG_PM
[ARM] pcm037: map AIPS1 and AIPS2 as nonshared area
[ARM] build fixes for netX serial driver
[ARM] 5323/1: Remove outdated empeg documentation.
[ARM] 5299/1: Add maintainer for Mobilepro 900/c
[ARM] corgi_lcd: fix simultaneous compilation with corgi_bl
[ARM] pxa/spitz: fix spi cs on spitz
[ARM] 5322/1: Fix fastpath issue in mmci.c
[ARM] xsc3: revert writethrough memory-type encoding change
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 73c84168761..d4af5c335f1 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 |