aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-osk.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-05 11:14:15 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-07 04:55:48 -0400
commita09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch)
tree69689f467179891b498bd7423fcf61925173db31 /arch/arm/mach-omap1/board-osk.c
parenta1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff)
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with. 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.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 4d8cd9fcb690..3e766e49f7cc 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -39,7 +39,7 @@
39 39
40#include <linux/i2c/tps65010.h> 40#include <linux/i2c/tps65010.h>
41 41
42#include <asm/arch/hardware.h> 42#include <mach/hardware.h>
43#include <asm/gpio.h> 43#include <asm/gpio.h>
44 44
45#include <asm/mach-types.h> 45#include <asm/mach-types.h>
@@ -47,12 +47,12 @@
47#include <asm/mach/map.h> 47#include <asm/mach/map.h>
48#include <asm/mach/flash.h> 48#include <asm/mach/flash.h>
49 49
50#include <asm/arch/usb.h> 50#include <mach/usb.h>
51#include <asm/arch/mux.h> 51#include <mach/mux.h>
52#include <asm/arch/tc.h> 52#include <mach/tc.h>
53#include <asm/arch/common.h> 53#include <mach/common.h>
54#include <asm/arch/mcbsp.h> 54#include <mach/mcbsp.h>
55#include <asm/arch/omap-alsa.h> 55#include <mach/omap-alsa.h>
56 56
57static struct mtd_partition osk_partitions[] = { 57static struct mtd_partition osk_partitions[] = {
58 /* bootloader (U-Boot, etc) in first sector */ 58 /* bootloader (U-Boot, etc) in first sector */
@@ -340,7 +340,7 @@ static struct omap_board_config_kernel osk_config[] __initdata = {
340#include <linux/spi/spi.h> 340#include <linux/spi/spi.h>
341#include <linux/spi/ads7846.h> 341#include <linux/spi/ads7846.h>
342 342
343#include <asm/arch/keypad.h> 343#include <mach/keypad.h>
344 344
345static const int osk_keymap[] = { 345static const int osk_keymap[] = {
346 /* KEY(col, row, code) */ 346 /* KEY(col, row, code) */