projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-net
[oweals/u-boot.git]
/
drivers
/
usb
/
musb-new
/
am35x.c
diff --git
a/drivers/usb/musb-new/am35x.c
b/drivers/usb/musb-new/am35x.c
index 57c9bd393b89b5addb1b5ac98a0136383140d992..d158454a086bbc2adbadc5656f228360c5f7d451 100644
(file)
--- a/
drivers/usb/musb-new/am35x.c
+++ b/
drivers/usb/musb-new/am35x.c
@@
-26,7
+26,6
@@
*
*/
*
*/
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/init.h>
#include <linux/module.h>
#ifndef __UBOOT__
#include <linux/init.h>
#include <linux/module.h>
@@
-101,7
+100,11
@@
struct am35x_glue {
/*
* am35x_musb_enable - enable interrupts
*/
/*
* am35x_musb_enable - enable interrupts
*/
+#ifndef __UBOOT__
static void am35x_musb_enable(struct musb *musb)
static void am35x_musb_enable(struct musb *musb)
+#else
+static int am35x_musb_enable(struct musb *musb)
+#endif
{
void __iomem *reg_base = musb->ctrl_base;
u32 epmask;
{
void __iomem *reg_base = musb->ctrl_base;
u32 epmask;
@@
-117,6
+120,9
@@
static void am35x_musb_enable(struct musb *musb)
if (is_otg_enabled(musb))
musb_writel(reg_base, CORE_INTR_SRC_SET_REG,
AM35X_INTR_DRVVBUS << AM35X_INTR_USB_SHIFT);
if (is_otg_enabled(musb))
musb_writel(reg_base, CORE_INTR_SRC_SET_REG,
AM35X_INTR_DRVVBUS << AM35X_INTR_USB_SHIFT);
+#ifdef __UBOOT__
+ return 0;
+#endif
}
/*
}
/*