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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
microblaze
/
include
/
asm
/
gpio.h
diff --git
a/arch/microblaze/include/asm/gpio.h
b/arch/microblaze/include/asm/gpio.h
index
ea04632
..
2b2c18b
100644
(file)
--- a/
arch/microblaze/include/asm/gpio.h
+++ b/
arch/microblaze/include/asm/gpio.h
@@
-11,8
+11,8
@@
* (at your option) any later version.
*/
* (at your option) any later version.
*/
-#ifndef _
_ASM_POWERPC
_GPIO_H
-#define _
_ASM_POWERPC
_GPIO_H
+#ifndef _
ASM_MICROBLAZE
_GPIO_H
+#define _
ASM_MICROBLAZE
_GPIO_H
#include <linux/errno.h>
#include <asm-generic/gpio.h>
#include <linux/errno.h>
#include <asm-generic/gpio.h>
@@
-38,12
+38,9
@@
static inline int gpio_cansleep(unsigned int gpio)
return __gpio_cansleep(gpio);
}
return __gpio_cansleep(gpio);
}
-/*
- * Not implemented, yet.
- */
static inline int gpio_to_irq(unsigned int gpio)
{
static inline int gpio_to_irq(unsigned int gpio)
{
- return
-ENOSYS
;
+ return
__gpio_to_irq(gpio)
;
}
static inline int irq_to_gpio(unsigned int irq)
}
static inline int irq_to_gpio(unsigned int irq)
@@
-53,4
+50,4
@@
static inline int irq_to_gpio(unsigned int irq)
#endif /* CONFIG_GPIOLIB */
#endif /* CONFIG_GPIOLIB */
-#endif /* _
_ASM_POWERPC
_GPIO_H */
+#endif /* _
ASM_MICROBLAZE
_GPIO_H */