Changeset 92574f4 in mainline for uspace/lib/usb/Makefile

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/usb/Makefile (modified) (1 diff)

uspace/lib/usb/Makefile

@@ -35 +35 @@
         src/addrkeep.c \
         src/class.c \
+        src/ddfiface.c \
         src/debug.c \
         src/dp.c \
-        src/drvpsync.c \
         src/dump.c \
-        src/hcdhubd.c \
-        src/hcdrv.c \
         src/hidparser.c \
-        src/localdrv.c \
+        src/hub.c \
         src/pipes.c \
+        src/pipesinit.c \
+        src/pipesio.c \
         src/recognise.c \
-        src/remotedrv.c \
         src/request.c \
         src/usb.c \
-        src/usbdrvreq.c \
-        src/usbdrv.c \
+        src/usbdevice.c \
         src/usbmem.c