On Sun, Jan 18, 2009 at 08:19:28AM -0800, David Brownell wrote:
> From: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
> Subject: drivers/usb/musb/davinci.c 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: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Acked-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
> ---
Greg, please apply these patches with my ack only, I'm in a hurry at
work and not enough time to queue this patches properly :-s
> drivers/usb/musb/davinci.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> --- a/drivers/usb/musb/davinci.c
> +++ b/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 *
> 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;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
