From: Wolfgang Denk <wd@denx.de>
Date: Tue, 5 Apr 2011 10:24:20 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
X-Git-Tag: v2011.06-rc1~185
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4db2fa7f9446d0f2fe8db3d62184b1212fe22707;p=karo-tx-uboot.git

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

Conflicts:
	drivers/usb/host/ehci-pci.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

4db2fa7f9446d0f2fe8db3d62184b1212fe22707
diff --cc drivers/usb/host/ehci-pci.c
index 2b68f7bd19,bf490b0d32..4abe5e3b59
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@@ -28,8 -28,8 +28,9 @@@
  #ifdef CONFIG_PCI_EHCI_DEVICE
  static struct pci_device_id ehci_pci_ids[] = {
  	/* Please add supported PCI EHCI controller ids here */
 -	{0x1033, 0x00E0},
 -	{0x10b9, 0x5239},	/* ULI1575 PCI EHCI module ids */
 +	{0x1033, 0x00E0},	/* NEC */
++	{0x10B9, 0x5239},	/* ULI1575 PCI EHCI module ids */
 +	{0x12D8, 0x400F},	/* Pericom */
  	{0, 0}
  };
  #endif