From: Colin Finck Date: Sun, 19 Jun 2011 10:13:59 +0000 (+0000) Subject: [USBDRIVER] X-Git-Tag: backups/ros-amd64-bringup@60669^2~253 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ead744a31ff8a8e95b492fa997805d61b7e3218c [USBDRIVER] No objections on the mailing list, so I'm excluding "usbdriver" from build. It should still stay as a reference in the tree till the new USB drivers are finalized and merged back to Trunk. svn path=/trunk/; revision=52361 --- diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff index 6a7a8a8d5c7..917366595af 100644 --- a/reactos/boot/bootdata/packages/reactos.dff +++ b/reactos/boot/bootdata/packages/reactos.dff @@ -540,7 +540,7 @@ drivers\storage\ide\pciidex\pciidex.sys 2 ;drivers\usb\miniport\usbuhci\usbuhci.sys 2 ;drivers\usb\usbhub\usbhub.sys 2 ;drivers\usb\usbport\usbport.sys 2 -drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1 diff --git a/reactos/drivers/usb/CMakeLists.txt b/reactos/drivers/usb/CMakeLists.txt index 291a4290b86..a7eb481921d 100644 --- a/reactos/drivers/usb/CMakeLists.txt +++ b/reactos/drivers/usb/CMakeLists.txt @@ -1,5 +1,5 @@ -add_subdirectory(nt4compat) +#add_subdirectory(nt4compat) add_subdirectory(usbd) #add_subdirectory(usbehci) The USB branch has usbehci_new #add_subdirectory(usbhub) Compiles, just skipped in trunk diff --git a/reactos/drivers/usb/directory.rbuild b/reactos/drivers/usb/directory.rbuild index e81eb8b291a..04b926b50fd 100644 --- a/reactos/drivers/usb/directory.rbuild +++ b/reactos/drivers/usb/directory.rbuild @@ -1,9 +1,9 @@ - +