Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / 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
-#ifdef CONFIG_MUSB_GADGET
+#ifdef CONFIG_USB_MUSB_GADGET
 #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
-#ifdef CONFIG_MUSB_HOST
+#ifdef CONFIG_USB_MUSB_HOST
 #define        is_host_capable()       (1)
 #else
 #define        is_host_capable()       (0)