Changeset 432a269 in mainline for uspace/drv/bus/usb/ohci/root_hub.h

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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/ohci/root_hub.h (modified) (2 diffs)

uspace/drv/bus/usb/ohci/root_hub.h

@@ -37 +37 @@
 #include <usb/usb.h>
 #include <usb/dev/driver.h>
+#include <usb/host/usb_transfer_batch.h>
 
 #include "ohci_regs.h"
-#include "batch.h"
 
 #define HUB_DESCRIPTOR_MAX_SIZE (7 + 2 + 2)
@@ -66 +66 @@
         /** size of hub descriptor */
         size_t hub_descriptor_size;
-
 } rh_t;