aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:25:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:25:46 -0700
commit4e9a4b71f1eb23f35c394eb2b388dbe0389d316a (patch)
treeec11040e38f137f3fc0f17dfcd177bf8db9c6ae7 /arch
parent2cb14596a03036bb8b9d3c60f9c4dbdf3a745c76 (diff)
parent7e0258fd28762c09b997edb56849ecfa29284b79 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: [PATCH] USB: ftdi_sio: add support for ASK RDR 400 series card reader [PATCH] USB: ftdi_sio: Adds support for iPlus device. [PATCH] USB: ftdi_sio vendor code for RR-CirKits LocoBuffer USB [PATCH] USB: Use new PCI_CLASS_SERIAL_USB_* defines [PATCH] USB: net2280: set driver data before it is used [PATCH] USB: net2280: check for shared IRQs [PATCH] USB: net2280: send 0-length packets for ep0 [PATCH] USB: net2280: Handle STALLs for 0-length control-IN requests [PATCH] USB: storage: atmel unusual dev update [PATCH] USB: Storage: unusual devs update [PATCH] USB: add new iTegno usb CDMA 1x card support for pl2303 [PATCH] USB: Resource leak fix for whiteheat driver
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/powermac/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index f5d8d15d74f..ea179afea63 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -1097,7 +1097,7 @@ pmac_pci_enable_device_hook(struct pci_dev *dev, int initial)
* (iBook second controller)
*/
if (dev->vendor == PCI_VENDOR_ID_APPLE
- && (dev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x10))
+ && dev->class == PCI_CLASS_SERIAL_USB_OHCI
&& !node) {
printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n",
pci_name(dev));