Commit 163b56c5 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://gkernel.bkbits.net/misc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 1588b25a b66922d9
...@@ -581,7 +581,7 @@ static int __init rng_init (void) ...@@ -581,7 +581,7 @@ static int __init rng_init (void)
DPRINTK ("ENTER\n"); DPRINTK ("ENTER\n");
/* Probe for Intel, AMD RNGs */ /* Probe for Intel, AMD RNGs */
while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) { for_each_pci_dev(pdev) {
ent = pci_match_device (rng_pci_tbl, pdev); ent = pci_match_device (rng_pci_tbl, pdev);
if (ent) { if (ent) {
rng_ops = &rng_vendor_ops[ent->driver_data]; rng_ops = &rng_vendor_ops[ent->driver_data];
......
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