diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 13:28:56 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 13:28:56 +0200 |
| commit | b6a4b7de4cb45ccf7157fc58de09c96f84d67108 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /include/linux/gpio.h | |
| parent | 2778d0d51dd5007c4909c1d9874f5e9097785a7a (diff) | |
| parent | 651dab4264e4ba0e563f5ff56f748127246e9065 (diff) | |
| download | lwn-b6a4b7de4cb45ccf7157fc58de09c96f84d67108.tar.gz lwn-b6a4b7de4cb45ccf7157fc58de09c96f84d67108.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers
Diffstat (limited to 'include/linux/gpio.h')
| -rw-r--r-- | include/linux/gpio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/gpio.h b/include/linux/gpio.h index 730a20b83576..e10c49a5b96e 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -8,6 +8,7 @@ #else +#include <linux/kernel.h> #include <linux/types.h> #include <linux/errno.h> @@ -32,6 +33,8 @@ static inline int gpio_request(unsigned gpio, const char *label) static inline void gpio_free(unsigned gpio) { + might_sleep(); + /* GPIO can never have been requested */ WARN_ON(1); } |