The last Kevin Hilman's patch seems to have been broken on its way to Greg's
tree and also probably clashed with yet another patch. Fix DaVinci build again.
Signed-off-by: Sergei Shtylyov <[EMAIL PROTECTED]>
---
Forgot to CC Kevin and DaVinci list in the original mail...
drivers/usb/musb/davinci.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
Index: mainline/drivers/usb/musb/davinci.c
===================================================================
--- mainline.orig/drivers/usb/musb/davinci.c
+++ mainline/drivers/usb/musb/davinci.c
@@ -32,9 +32,9 @@
#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 +370,6 @@ int musb_platform_set_mode(struct musb *
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;
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
