usb: musb-new: CONFIG_MUSB prefix replacement with CONFIG_USB_MUSB

[u-boot] / drivers / usb / musb / musb_hcd.h

diff --git a/drivers/usb/musb/musb_hcd.h b/drivers/usb/musb/musb_hcd.h
index 02b9adcbe4efb8d813654741de318b4bc7c31e0d..831957d9f9fc034ef8f677574fcd26998b59e36c 100644 (file)
--- a/drivers/usb/musb/musb_hcd.h
+++ b/drivers/usb/musb/musb_hcd.h
@@ -17,8 +17,8 @@
 extern unsigned char new[];
 #endif
 
-#ifndef CONFIG_MUSB_TIMEOUT
-# define CONFIG_MUSB_TIMEOUT 100000
+#ifndef CONFIG_USB_MUSB_TIMEOUT
+# define CONFIG_USB_MUSB_TIMEOUT 100000
 #endif
 
 /* This defines the endpoint number used for control transfers */
@@ -37,9 +37,6 @@ extern unsigned char new[];
        ((readb(&musbr->power) & MUSB_POWER_HSMODE) \
                >> MUSB_POWER_HSMODE_SHIFT)
 
-#define min_t(type, x, y)      \
-       ({ type __x = (x); type __y = (y); __x < __y ? __x : __y; })
-
 /* USB HUB CONSTANTS (not OHCI-specific; see hub.h) */
 
 /* destination of request */