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 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
include
/
mach
/
gpio.h
diff --git
a/arch/arm/mach-shmobile/include/mach/gpio.h
b/arch/arm/mach-shmobile/include/mach/gpio.h
index
5bc6bd4
..
2b1bb9e
100644
(file)
--- a/
arch/arm/mach-shmobile/include/mach/gpio.h
+++ b/
arch/arm/mach-shmobile/include/mach/gpio.h
@@
-35,12
+35,12
@@
static inline int gpio_cansleep(unsigned gpio)
static inline int gpio_to_irq(unsigned gpio)
{
- return
-ENOSYS
;
+ return
__gpio_to_irq(gpio)
;
}
static inline int irq_to_gpio(unsigned int irq)
{
- return -E
INVAL
;
+ return -E
NOSYS
;
}
#endif /* CONFIG_GPIOLIB */