diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-29 17:14:37 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-29 17:14:37 -0400 |
| commit | 325f06713337928df572d12d65bdaf91f4d53d83 (patch) | |
| tree | bb3ab5f6aa6fc0b78c763b5477250430b9e511da /arch/arm | |
| parent | d5f73cd6e2087fa9dd07fb87838d44c384569ee4 (diff) | |
| parent | 075954b1a935899865fd3f7b5cddef42b8b6d57e (diff) | |
Merge branch 'vt8500/devel' into next/dt
Picked up one more bugfix by Tony Prisk:
* vt8500/devel:
arm: vt8500: Fixup for missing gpio.h
Diffstat (limited to 'arch/arm')
| -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 @@ | |||
| 32 | #include <linux/of_platform.h> | 32 | #include <linux/of_platform.h> |
| 33 | 33 | ||
| 34 | #include <mach/restart.h> | 34 | #include <mach/restart.h> |
| 35 | #include <mach/gpio.h> | ||
| 36 | 35 | ||
| 37 | #include "common.h" | 36 | #include "common.h" |
| 38 | 37 | ||