summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-osk.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-07-26 10:53:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-08-08 14:27:41 +0100
commit2f8163baada3dbd0ce891c35bc59ae46e773487a (patch)
treecf148d2c014e777bf374e49daa74ba68e440a5d7 /arch/arm/mach-omap1/board-osk.c
parentb7a949549de42e4cf8af301c63ee8af13a06a956 (diff)
downloadtalos-obmc-linux-2f8163baada3dbd0ce891c35bc59ae46e773487a.tar.gz
talos-obmc-linux-2f8163baada3dbd0ce891c35bc59ae46e773487a.zip
ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h
Convert arch/arm includes of mach/gpio.h and asm/gpio.h to linux/gpio.h before we start consolidating the individual platform implementations of the gpio header files. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
-rw-r--r--arch/arm/mach-omap1/board-osk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index b08a21380772..bf1ebe5b2442 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -25,7 +25,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
@@ -42,7 +42,6 @@
#include <linux/i2c/tps65010.h>
#include <mach/hardware.h>
-#include <asm/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
OpenPOWER on IntegriCloud