diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /arch/powerpc/platforms/powermac/pci.c | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/platforms/powermac/pci.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index 3212618e7909..80035853467b 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c | |||
| @@ -1094,7 +1094,7 @@ pmac_pci_enable_device_hook(struct pci_dev *dev, int initial) | |||
| 1094 | * (iBook second controller) | 1094 | * (iBook second controller) |
| 1095 | */ | 1095 | */ |
| 1096 | if (dev->vendor == PCI_VENDOR_ID_APPLE | 1096 | if (dev->vendor == PCI_VENDOR_ID_APPLE |
| 1097 | && (dev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x10)) | 1097 | && dev->class == PCI_CLASS_SERIAL_USB_OHCI |
| 1098 | && !node) { | 1098 | && !node) { |
| 1099 | printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n", | 1099 | printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n", |
| 1100 | pci_name(dev)); | 1100 | pci_name(dev)); |