From 71d23f63337019c27a44f5d8daea6370546972be Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Sat, 24 Jan 2009 17:56:17 -0800
Subject: [PATCH] --- yaml --- r: 130307 b: refs/heads/master c:
 10b4eadef140b09baf8b9ec1df37185e69773275 h: refs/heads/master i:   130305:
 50b4f011f5c6ac369bf6418b09436908d638ff75   130303:
 28db0b7c931bfb0e5b07a4d16734310343b19ec0 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/usb/musb/davinci.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 3b4855dd163a..824b7f9ad305 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bf5fa13fc8e34d7b86307b99f64a24cb7a83852
+refs/heads/master: 10b4eadef140b09baf8b9ec1df37185e69773275
diff --git a/trunk/drivers/usb/musb/davinci.c b/trunk/drivers/usb/musb/davinci.c
index 0d566dc5ce06..5a8fd5d57a11 100644
--- a/trunk/drivers/usb/musb/davinci.c
+++ b/trunk/drivers/usb/musb/davinci.c
@@ -32,9 +32,10 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 
-#include <mach/arch/hardware.h>
-#include <mach/arch/memory.h>
-#include <mach/arch/gpio.h>
+#include <mach/hardware.h>
+#include <mach/memory.h>
+#include <mach/gpio.h>
+
 #include <asm/mach-types.h>
 
 #include "musb_core.h"
@@ -370,12 +371,6 @@ int musb_platform_set_mode(struct musb *musb, u8 mode)
 	return -EIO;
 }
 
-int musb_platform_set_mode(struct musb *musb, u8 mode)
-{
-       /* EVM can't do this (right?) */
-       return -EIO;
-}
-
 int __init musb_platform_init(struct musb *musb)
 {
 	void __iomem	*tibase = musb->ctrl_base;