Changeset 8ff0bd2 in mainline for uspace/drv/bus/usb/uhci/uhci.ma

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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

File:

• uspace/drv/bus/usb/uhci/uhci.ma (moved) (moved from uspace/drv/uhci_hcd/uhci_hcd.ma ) (2 diffs)

uspace/drv/bus/usb/uhci/uhci.ma

@@ -6 +6 @@
 10 pci/ven=8086&dev=27ca
 10 pci/ven=8086&dev=27cb
-
 
 10 pci/ven=8086&dev=2830
@@ -24 +23 @@
 10 pci/ven=8086&dev=24c4
 10 pci/ven=8086&dev=24c7
+
+10 pci/ven=8086&dev=2688
+10 pci/ven=8086&dev=2689
+10 pci/ven=8086&dev=268a
+10 pci/ven=8086&dev=268b