Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10b4eade authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: musb davinci buildfix 



Trying once more to get this merged.  The original was submitted
for 2.6.27-rc2 or so, and never got correctly merged.  Neither
were any of the numerous subsequent resends.  Sigh.

  CC      drivers/usb/musb/davinci.o
drivers/usb/musb/davinci.c:35:32: error: mach/arch/hardware.h: No such file or directory
drivers/usb/musb/davinci.c:36:30: error: mach/arch/memory.h: No such file or directory
drivers/usb/musb/davinci.c:37:28: error: mach/arch/gpio.h: No such file or directory
drivers/usb/musb/davinci.c:373: error: redefinition of 'musb_platform_set_mode'
drivers/usb/musb/davinci.c:368: error: previous definition of 'musb_platform_set_mode' was here

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2bf5fa13

drivers/usb/musb/davinci.c

+4 −9
Original line number Diff line number Diff line
@@ -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;