diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 14:09:06 -0600 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 14:09:06 -0600 |
commit | ca869912366f60cb5e0bdd09f65e80ee6816e73c (patch) | |
tree | a72913a29495ca078987c09fc0008f47e11b900b /arch/i386/pci/fixup.c | |
parent | dd8a306ac0c918268bd2ae89da2dea627f6e352d (diff) | |
parent | 388f7ef720a982f49925e7b4e96f216f208f8c03 (diff) | |
download | linux-ca869912366f60cb5e0bdd09f65e80ee6816e73c.tar.gz |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'arch/i386/pci/fixup.c')
-rw-r--r-- | arch/i386/pci/fixup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c index 3984226a8b98..eeb1b1f2d548 100644 --- a/arch/i386/pci/fixup.c +++ b/arch/i386/pci/fixup.c @@ -433,9 +433,8 @@ static void __devinit pci_post_fixup_toshiba_ohci1394(struct pci_dev *dev) return; /* only applies to certain Toshibas (so far) */ /* Restore config space on Toshiba laptops */ - mdelay(10); pci_write_config_word(dev, PCI_CACHE_LINE_SIZE, toshiba_line_size); - pci_write_config_word(dev, PCI_INTERRUPT_LINE, dev->irq); + pci_read_config_byte(dev, PCI_INTERRUPT_LINE, (u8 *)&dev->irq); pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, pci_resource_start(dev, 0)); pci_write_config_dword(dev, PCI_BASE_ADDRESS_1, |