summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/board-voiceblue.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-11-11 05:10:34 +0300
committerTony Lindgren <tony@atomide.com>2009-11-11 05:10:34 +0300
commit774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch)
treea9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/mach-omap1/board-voiceblue.c
parentb419148e567728f6af0c3b01965c1cc141e3e13a (diff)
parentce491cf85466c3377228c5a852ea627ec5136956 (diff)
downloadlinux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.xz
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap1/board-voiceblue.c')
-rw-r--r--arch/arm/mach-omap1/board-voiceblue.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 07b07522d5bf..35c75c1bd0aa 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -29,11 +29,11 @@
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
-#include <mach/common.h>
+#include <plat/common.h>
#include <mach/gpio.h>
-#include <mach/mux.h>
-#include <mach/tc.h>
-#include <mach/usb.h>
+#include <plat/mux.h>
+#include <plat/tc.h>
+#include <plat/usb.h>
static struct plat_serial8250_port voiceblue_ports[] = {
{