diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/mach-omap1/board-palmtt.c | |
parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap1/board-palmtt.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmtt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index d972cf941b76..af068e3e0fe7 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
@@ -29,16 +29,16 @@ | |||
29 | #include <asm/mach/map.h> | 29 | #include <asm/mach/map.h> |
30 | #include <asm/mach/flash.h> | 30 | #include <asm/mach/flash.h> |
31 | 31 | ||
32 | #include <mach/led.h> | 32 | #include <plat/led.h> |
33 | #include <mach/gpio.h> | 33 | #include <mach/gpio.h> |
34 | #include <mach/mux.h> | 34 | #include <plat/mux.h> |
35 | #include <mach/usb.h> | 35 | #include <plat/usb.h> |
36 | #include <mach/dma.h> | 36 | #include <plat/dma.h> |
37 | #include <mach/tc.h> | 37 | #include <plat/tc.h> |
38 | #include <mach/board.h> | 38 | #include <plat/board.h> |
39 | #include <mach/irda.h> | 39 | #include <plat/irda.h> |
40 | #include <mach/keypad.h> | 40 | #include <plat/keypad.h> |
41 | #include <mach/common.h> | 41 | #include <plat/common.h> |
42 | 42 | ||
43 | #include <linux/spi/spi.h> | 43 | #include <linux/spi/spi.h> |
44 | #include <linux/spi/ads7846.h> | 44 | #include <linux/spi/ads7846.h> |