Merge with git://www.denx.de/git/u-boot.git

diff --combined drivers/usb_ohci.c
index 388827fd001aad77e4861ce5ba44b0fc5da2d777,14984a5f39c17b643951f0d9b3398ba0327aaa74..7ddcab63e736cf395e23c7f8973f68be7d22a4d5
--- 1/drivers/usb_ohci.c
--- 2/drivers/usb_ohci.c
+++ b/drivers/usb_ohci.c
@@@ -93,7 -93,6 +93,7 @@@
  #ifdef CONFIG_PCI_OHCI
  static struct pci_device_id ohci_pci_ids[] = {
        {0x10b9, 0x5237},       /* ULI1575 PCI OHCI module ids */
 +      {0x1033, 0x0035},       /* NEC PCI OHCI module ids */
        /* Please add supported PCI OHCI controller ids here */
        {0, 0}
  };
@@@ -133,8 -132,6 +133,6 @@@ int got_rhsc
  /* device which was disconnected */
  struct usb_device *devgone;
  
- 
- 
  /*-------------------------------------------------------------------------*/
  
  /* AMD-756 (D2 rev) reports corrupt register contents in some cases.
@@@ -158,7 -155,6 +156,6 @@@ static inline u32 roothub_status (struc
  static u32 roothub_portstatus (struct ohci *hc, int i)
        { return read_roothub (hc, portstatus [i], 0xffe0fce0); }
  
- 
  /* forward declaration */
  static int hc_interrupt (void);
  static void
@@@ -413,8 -409,6 +410,6 @@@ static void ohci_dump (ohci_t *controll
                ep_print_int_eds (controller, "hcca");
        dbg ("hcca frame #%04x", controller->hcca->frame_no);
        ohci_dump_roothub (controller, 1);
- }
- 
  
  #endif /* DEBUG */
  
@@@ -675,7 -669,7 +670,7 @@@ static int ep_link (ohci_t *ohci, ed_t 
                                ed_p = &(((ed_t *)ed_p)->hwNextED))
                                        inter = ep_rev (6, ((ed_t *)ed_p)->int_interval);
                        ed->hwNextED = *ed_p;
-                       *ed_p = m32_swap(ed);
+                       *ed_p = m32_swap((unsigned long)ed);
                }
                break;
        }
@@@ -693,16 -687,15 +688,15 @@@ static void periodic_unlink ( struct oh
  
                /* ED might have been unlinked through another path */
                while (*ed_p != 0) {
-                       if (((struct ed *)m32_swap (ed_p)) == ed) {
+                       if (((struct ed *)m32_swap ((unsigned long)ed_p)) == ed) {
                                *ed_p = ed->hwNextED;
                                break;
                        }
-                       ed_p = & (((struct ed *)m32_swap (ed_p))->hwNextED);
+                       ed_p = & (((struct ed *)m32_swap ((unsigned long)ed_p))->hwNextED);
                }
        }
  }
  
- 
  /* unlink an ed from one of the HC chains.
   * just the link to the ed is unlinked.
   * the link from the ed still points to another operational ed or 0
@@@ -760,7 -753,6 +754,6 @@@ static int ep_unlink (ohci_t *ohci, ed_
        return 0;
  }
  
- 
  /*-------------------------------------------------------------------------*/
  
  /* add/reinit an endpoint; this should be done once at the
@@@ -940,7 -932,6 +933,6 @@@ static void td_submit_job (struct usb_d
   * Done List handling functions
   *-------------------------------------------------------------------------*/
  
- 
  /* calculate the transfer length and update the urb */
  
  static void dl_transfer_length(td_t * td)
@@@ -952,7 -943,6 +944,6 @@@
        tdBE   = m32_swap (td->hwBE);
        tdCBP  = m32_swap (td->hwCBP);
  
- 
        if (!(usb_pipetype (lurb_priv->pipe) == PIPE_CONTROL &&
            ((td->index == 0) || (td->index == lurb_priv->length - 1)))) {
                if (tdBE != 0) {
@@@ -1095,7 -1085,6 +1086,6 @@@ static __u8 root_hub_dev_des[] 
        0x01        /*  __u8  bNumConfigurations; */
  };
  
- 
  /* Configuration descriptor */
  static __u8 root_hub_config_des[] =
  {
@@@ -1173,7 -1162,6 +1163,6 @@@ static unsigned char root_hub_str_index
  
  /* Hub class-specific descriptor is constructed dynamically */
  
- 
  /*-------------------------------------------------------------------------*/
  
  #define OK(x)                 len = (x); break