Changeset 26e7d6d in mainline for uspace/drv/bus/usb/uhci/Makefile

Timestamp:

2011-09-19T16:31:00Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/Makefile (moved) (moved from uspace/drv/uhci/Makefile ) (3 diffs)

uspace/drv/bus/usb/uhci/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../../..
 
 LIBS = \
@@ -33 +33 @@
         $(LIBUSB_PREFIX)/libusb.a \
         $(LIBDRV_PREFIX)/libdrv.a
+
 EXTRA_CFLAGS += \
         -I$(LIBUSB_PREFIX)/include \
@@ -41 +42 @@
 
 SOURCES = \
-        iface.c \
+        hc.c \
         main.c \
+        pci.c \
+        root_hub.c \
         transfer_list.c \
         uhci.c \
-        hc.c \
-        root_hub.c \
-        hw_struct/transfer_descriptor.c \
-        pci.c \
-        batch.c
+        uhci_batch.c \
+        hw_struct/transfer_descriptor.c
 
 include $(USPACE_PREFIX)/Makefile.common