diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-09-29 14:14:37 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 14:14:37 -0700 |
| commit | 325f06713337928df572d12d65bdaf91f4d53d83 (patch) | |
| tree | bb3ab5f6aa6fc0b78c763b5477250430b9e511da | |
| parent | Merge tag 'devel-dt-arch-timer-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt (diff) | |
| parent | arm: vt8500: Fixup for missing gpio.h (diff) | |
| download | linux-dev-325f06713337928df572d12d65bdaf91f4d53d83.tar.xz linux-dev-325f06713337928df572d12d65bdaf91f4d53d83.zip | |
Merge branch 'vt8500/devel' into next/dt
Picked up one more bugfix by Tony Prisk:
* vt8500/devel:
arm: vt8500: Fixup for missing gpio.h
| -rw-r--r-- | arch/arm/mach-vt8500/vt8500.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index 449499354449..587ea950d08b 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c @@ -32,7 +32,6 @@ #include <linux/of_platform.h> #include <mach/restart.h> -#include <mach/gpio.h> #include "common.h" |