Merge branch 'master' into next

[u-boot] / cpu / ppc4xx / usbdev.c

diff --git a/cpu/ppc4xx/usbdev.c b/cpu/ppc4xx/usbdev.c
index 6140d2a9089f4402d82957dfed129042925df67f..5bb4f3ce632cd8cfb7a32846ec037342c47056ad 100644 (file)
--- a/cpu/ppc4xx/usbdev.c
+++ b/cpu/ppc4xx/usbdev.c
@@ -3,11 +3,11 @@
 #include <common.h>
 #include <asm/processor.h>
 
-#if (defined(CONFIG_440EP) || defined(CONFIG_440EPX)) && (CONFIG_COMMANDS & CFG_CMD_USB)
+#if (defined(CONFIG_440EP) || defined(CONFIG_440EPX)) && defined(CONFIG_CMD_USB)
 
 #include <usb.h>
+#include <asm/ppc4xx-uic.h>
 #include "usbdev.h"
-#include "vecnum.h"
 
 #define USB_DT_DEVICE        0x01
 #define USB_DT_CONFIG        0x02
@@ -197,7 +197,7 @@ void usb_dev_init()
        /*enable interrupts */
        *(unsigned char *)USB2D0_INTRUSBE_8 = 0x0f;
 
-       irq_install_handler(VECNUM_HSB2D, (interrupt_handler_t *) usbInt,
+       irq_install_handler(VECNUM_USBDEV, (interrupt_handler_t *) usbInt,
                            NULL);
 }
 #else
@@ -206,14 +206,14 @@ void usb_dev_init()
 #ifdef USB_2_0_DEVICE
        printf("USB 2.0 Device init\n");
        /*select 2.0 device */
-       mtsdr(sdr_usb0, 0x0);   /* 2.0 */
+       mtsdr(SDR0_USB0, 0x0);  /* 2.0 */
 
        /*usb dev init */
        *(unsigned char *)USB2D0_POWER_8 = 0xa1;        /* 2.0 */
 #else
        printf("USB 1.1 Device init\n");
        /*select 1.1 device */
-       mtsdr(sdr_usb0, 0x2);   /* 1.1 */
+       mtsdr(SDR0_USB0, 0x2);  /* 1.1 */
 
        /*usb dev init */
        *(unsigned char *)USB2D0_POWER_8 = 0xc0;        /* 1.1 */