ddr: altera: sdram: Clean up sdram_mmr_init_full() part 5

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

diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index f0ba8aaaa321d7ffbf12759e66c536ee5c4e5c18..9a3b61aa557b8cea2c8ff996dfc6aef8aebe60a7 100644 (file)
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -117,7 +117,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
 {
        u16 csr;
        int result = 1;
-       int timeout = CONFIG_MUSB_TIMEOUT;
+       int timeout = CONFIG_USB_MUSB_TIMEOUT;
 
        while (result > 0) {
                csr = readw(&musbr->txcsr);
@@ -179,7 +179,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
 static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
 {
        u16 csr;
-       int timeout = CONFIG_MUSB_TIMEOUT;
+       int timeout = CONFIG_USB_MUSB_TIMEOUT;
 
        do {
                if (check_stall(ep, 1)) {
@@ -211,7 +211,7 @@ static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
 static int wait_until_rxep_ready(struct usb_device *dev, u8 ep)
 {
        u16 csr;
-       int timeout = CONFIG_MUSB_TIMEOUT;
+       int timeout = CONFIG_USB_MUSB_TIMEOUT;
 
        do {
                if (check_stall(ep, 0)) {