Changeset 6843a9c in mainline for uspace/drv/bus/usb/ohci/ohci.ma


Ignore:
Timestamp:
2012-06-29T13:02:14Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/ohci/ohci.ma

    rba72f2b r6843a9c  
    1 10 pci/ven=106b&dev=0026
    2 10 pci/ven=106b&dev=003f
    3 10 pci/ven=10de&dev=0aa5
    4 
    5 10 pci/ven=1002&dev=4374
    6 10 pci/ven=1002&dev=4375
    7 
    8 10 pci/ven=1002&dev=4387
    9 10 pci/ven=1002&dev=4388
    10 10 pci/ven=1002&dev=4389
    11 10 pci/ven=1002&dev=438a
    12 10 pci/ven=1002&dev=438b
    13 10 pci/ven=1002&dev=4397
    14 10 pci/ven=1002&dev=4398
    15 10 pci/ven=1002&dev=4399
     110 pci/class=0c&subclass=03&progif=10
Note: See TracChangeset for help on using the changeset viewer.