diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-11-21 23:42:06 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-11-21 23:42:06 +0000 |
| commit | 300e812db26f4aa022e346f5fb9af1af134d98d8 (patch) | |
| tree | 382b45253a704087e8aa0c770bf3fc2ad67d4b02 /arch/arm/plat-omap/debug-devices.c | |
| parent | 4420dd2b306f1997232a13462bca0d420be5b1b8 (diff) | |
| parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) | |
Merge commit 'v3.2-rc2' into fbdev-next
Diffstat (limited to 'arch/arm/plat-omap/debug-devices.c')
| -rw-r--r-- | arch/arm/plat-omap/debug-devices.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c index 923c9621096..caa1f7b6cc2 100644 --- a/arch/arm/plat-omap/debug-devices.c +++ b/arch/arm/plat-omap/debug-devices.c @@ -8,7 +8,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> @@ -18,7 +18,6 @@ #include <mach/hardware.h> #include <plat/board.h> -#include <mach/gpio.h> /* Many OMAP development platforms reuse the same "debug board"; these |