Changeset a81a1d09 in mainline for uspace/drv/ohci/hw_struct

Timestamp:

2011-05-11T16:49:28Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

Location:

uspace/drv/ohci/hw_struct

Files:

• endpoint_descriptor.h (modified) (1 diff)
• transfer_descriptor.c (modified) (1 diff)
• transfer_descriptor.h (modified) (1 diff)

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -40 +40 @@
 #include <usb/host/endpoint.h>
 
-#include "utils/malloc32.h"
+#include "../utils/malloc32.h"
 #include "transfer_descriptor.h"
 

uspace/drv/ohci/hw_struct/transfer_descriptor.c

@@ -33 +33 @@
  */
 #include <usb/usb.h>
-#include "utils/malloc32.h"
-
 #include "transfer_descriptor.h"
 

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -37 +37 @@
 #include <bool.h>
 #include <stdint.h>
-#include "utils/malloc32.h"
+#include "../utils/malloc32.h"
 
 #include "completion_codes.h"