Commit 4838bc63 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://gkernel.bkbits.net/net-drivers-2.5

into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents ac464b3f d57064b7
...@@ -69,7 +69,7 @@ static struct pci_device_id pcnet32_pci_tbl[] = { ...@@ -69,7 +69,7 @@ static struct pci_device_id pcnet32_pci_tbl[] = {
MODULE_DEVICE_TABLE (pci, pcnet32_pci_tbl); MODULE_DEVICE_TABLE (pci, pcnet32_pci_tbl);
int cards_found __initdata; static int cards_found;
/* /*
* VLB I/O addresses * VLB I/O addresses
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment