From 80c1991f2a5418d84dc10cae3cb4c934c1f307b8 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 13 Sep 2010 13:44:47 +0100 Subject: [PATCH] --- yaml --- r: 211046 b: refs/heads/master c: 63f469324f999a28e67b90eb27a5fe0e379b7064 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-u300/include/mach/gpio.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b31843de5d85..bbb9d35bba2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0719f52d90aed5b82ecf2f3ed14bc4ced3d1a8a +refs/heads/master: 63f469324f999a28e67b90eb27a5fe0e379b7064 diff --git a/trunk/arch/arm/mach-u300/include/mach/gpio.h b/trunk/arch/arm/mach-u300/include/mach/gpio.h index 7b1fc984abb6..d5a71abcbaea 100644 --- a/trunk/arch/arm/mach-u300/include/mach/gpio.h +++ b/trunk/arch/arm/mach-u300/include/mach/gpio.h @@ -273,6 +273,9 @@ extern void gpio_pullup(unsigned gpio, int value); extern int gpio_get_value(unsigned gpio); extern void gpio_set_value(unsigned gpio, int value); +#define gpio_get_value_cansleep gpio_get_value +#define gpio_set_value_cansleep gpio_set_value + /* wrappers to sleep-enable the previous two functions */ static inline unsigned gpio_to_irq(unsigned gpio) {