Changeset 4fe3b6d in mainline for uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.h

Timestamp:

2011-05-20T11:07:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 with development

File:

• uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.h (modified) (1 diff)

uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.h

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_TRANSFER_DESCRIPTOR_H
-#define DRV_UHCI_TRANSFER_DESCRIPTOR_H
+#ifndef DRV_UHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
+#define DRV_UHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
 
 #include <mem.h>