diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 08:54:28 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 08:54:28 -0500 |
| commit | d4263348f796f29546f90802177865dd4379dd0a (patch) | |
| tree | adcbdaebae584eee2f32fab95e826e8e49eef385 /include/linux/gpio.h | |
| parent | be873ac782f5ff5ee6675f83929f4fe6737eead2 (diff) | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/gpio.h')
| -rw-r--r-- | include/linux/gpio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/gpio.h b/include/linux/gpio.h index c177c48f60a2..85aa5d0b9357 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h | |||
| @@ -90,7 +90,6 @@ void devm_gpio_free(struct device *dev, unsigned int gpio); | |||
| 90 | 90 | ||
| 91 | #include <linux/kernel.h> | 91 | #include <linux/kernel.h> |
| 92 | #include <linux/types.h> | 92 | #include <linux/types.h> |
| 93 | #include <linux/errno.h> | ||
| 94 | #include <linux/bug.h> | 93 | #include <linux/bug.h> |
| 95 | #include <linux/pinctrl/pinctrl.h> | 94 | #include <linux/pinctrl/pinctrl.h> |
| 96 | 95 | ||