summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-04-25 14:37:29 +0000
committerwdenk <wdenk>2004-04-25 14:37:29 +0000
commit0b8fa03b6df4130b2c8b215b85f36ab96eaa21f9 (patch)
tree4016b1ebd23d320ad609dc7bedf18ba4cbd8ab56 /drivers
parentb9711de10218ce3072dcc77d83294d19ac78e193 (diff)
downloadu-boot-imx-0b8fa03b6df4130b2c8b215b85f36ab96eaa21f9.zip
u-boot-imx-0b8fa03b6df4130b2c8b215b85f36ab96eaa21f9.tar.gz
u-boot-imx-0b8fa03b6df4130b2c8b215b85f36ab96eaa21f9.tar.bz2
* Patch by Christian Hohnstaedt, 23 Apr 2004:
JFFS2 speed enhancements: - repair header CRC calculation in jffs2_1pass.c - add eraseblock size to the partition information to skip empty eraseblocks if we find more then 4k of free space. - The JFFS2 scanner is now fast enough to remove the spinning wheel so #ifdef-ed out. - add watchdog calls in long running loops * Patch by Philippe Robin, 22 Apr 2004: Fix ethernet configuration for "versatile" board * Patch by Kshitij Gupta, 21 Apr 2004: Remove busy loop and use MPU timer fr usleep() on OMAP1510/1610 boards * Patch by Steven Scholz, 24 Feb 2004: Fix a bug in AT91RM9200 ethernet driver: The MII interface is now initialized before accessing the PHY. * Cleanup PCI ID's
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ns8382x.c2
-rw-r--r--drivers/sk98lin/skge.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ns8382x.c b/drivers/ns8382x.c
index 154d6ca..281940b 100644
--- a/drivers/ns8382x.c
+++ b/drivers/ns8382x.c
@@ -266,7 +266,7 @@ static int ns8382x_poll(struct eth_device *dev);
static void ns8382x_disable(struct eth_device *dev);
static struct pci_device_id supported[] = {
- {PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_8382x},
+ {PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_83820},
{}
};
diff --git a/drivers/sk98lin/skge.c b/drivers/sk98lin/skge.c
index ff7e2af..61a6094 100644
--- a/drivers/sk98lin/skge.c
+++ b/drivers/sk98lin/skge.c
@@ -494,7 +494,7 @@ static struct proc_dir_entry *pSkRootDir;
static struct pci_device_id supported[] = {
{PCI_VENDOR_ID_3COM, 0x1700},
{PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE},
- {PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE_SA},
+ {PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_YU},
{}
};