projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'gma500-fixes' of git://github.com/patjak/drm-gma500 into drm-fixes
[deliverable/linux.git]
/
include
/
linux
/
gpio.h
diff --git
a/include/linux/gpio.h
b/include/linux/gpio.h
index f6c7ae3e223b53914eac6ae4941a977d03597636..552e3f46e4a33f5b4915c86182c13cf0c876233a 100644
(file)
--- a/
include/linux/gpio.h
+++ b/
include/linux/gpio.h
@@
-39,7
+39,7
@@
struct gpio {
const char *label;
};
const char *label;
};
-#ifdef CONFIG_G
ENERIC_GPIO
+#ifdef CONFIG_G
PIOLIB
#ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H
#include <asm/gpio.h>
#ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H
#include <asm/gpio.h>
@@
-74,7
+74,7
@@
static inline int irq_to_gpio(unsigned int irq)
#endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */
#endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */
-#else /* ! CONFIG_G
ENERIC_GPIO
*/
+#else /* ! CONFIG_G
PIOLIB
*/
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-226,7
+226,7
@@
gpiochip_remove_pin_ranges(struct gpio_chip *chip)
WARN_ON(1);
}
WARN_ON(1);
}
-#endif /* ! CONFIG_G
ENERIC_GPIO
*/
+#endif /* ! CONFIG_G
PIOLIB
*/
struct device;
struct device;
This page took
0.040407 seconds
and
5
git commands to generate.