diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-17 23:34:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-17 23:34:28 +0300 |
| commit | 16da0961d3d5521f6541a422c5485ea4ddfe860b (patch) | |
| tree | 0f95bb44b851363ef777ae934be6c93eed247a4a | |
| parent | 7f2444d38f6bbfa12bc15e2533d8f9daa85ca02b (diff) | |
| parent | 372ea263b3d9cdeb70f8cffa025b2e0875e51b62 (diff) | |
| download | linux-16da0961d3d5521f6541a422c5485ea4ddfe860b.tar.xz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer:
"Only a single change, fix up header include in ColdFire specific GPIO
handling code"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: coldfire: Include the GPIO driver header
| -rw-r--r-- | arch/m68k/coldfire/gpio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c index a83898426127..ca26de257871 100644 --- a/arch/m68k/coldfire/gpio.c +++ b/arch/m68k/coldfire/gpio.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/device.h> +#include <linux/gpio/driver.h> #include <linux/io.h> #include <asm/coldfire.h> |