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-spi
[oweals/u-boot.git]
/
drivers
/
usb
/
musb-new
/
musb_core.h
diff --git
a/drivers/usb/musb-new/musb_core.h
b/drivers/usb/musb-new/musb_core.h
index 8727f6415e7bc81f5f2273eb4d44afaf2524f6b6..c8180404811fa6146a5893a6514455a67d920641 100644
(file)
--- a/
drivers/usb/musb-new/musb_core.h
+++ b/
drivers/usb/musb-new/musb_core.h
@@
-97,7
+97,7
@@
struct musb_ep;
#ifndef __UBOOT__
#define is_peripheral_capable() (1)
#else
#ifndef __UBOOT__
#define is_peripheral_capable() (1)
#else
-#ifdef CONFIG_MUSB_GADGET
+#ifdef CONFIG_
USB_
MUSB_GADGET
#define is_peripheral_capable() (1)
#else
#define is_peripheral_capable() (0)
#define is_peripheral_capable() (1)
#else
#define is_peripheral_capable() (0)
@@
-118,7
+118,7
@@
extern void musb_g_disconnect(struct musb *);
#ifndef __UBOOT__
#define is_host_capable() (1)
#else
#ifndef __UBOOT__
#define is_host_capable() (1)
#else
-#ifdef CONFIG_MUSB_HOST
+#ifdef CONFIG_
USB_
MUSB_HOST
#define is_host_capable() (1)
#else
#define is_host_capable() (0)
#define is_host_capable() (1)
#else
#define is_host_capable() (0)