git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
gpio.h
diff --git
a/arch/sh/include/asm/gpio.h
b/arch/sh/include/asm/gpio.h
index
f8d9a73
..
04f53d3
100644
(file)
--- a/
arch/sh/include/asm/gpio.h
+++ b/
arch/sh/include/asm/gpio.h
@@
-41,14
+41,12
@@
static inline int gpio_cansleep(unsigned gpio)
static inline int gpio_to_irq(unsigned gpio)
{
- WARN_ON(1);
- return -ENOSYS;
+ return __gpio_to_irq(gpio);
}
static inline int irq_to_gpio(unsigned int irq)
{
- WARN_ON(1);
- return -EINVAL;
+ return -ENOSYS;
}
#endif /* CONFIG_GPIOLIB */