diff -urN kernel-source-usbip-0.1.5.orig/stub_main.c kernel-source-usbip-0.1.5/stub_main.c
--- kernel-source-usbip-0.1.5.orig/stub_main.c	2007-07-29 03:04:44 +0300
+++ kernel-source-usbip-0.1.5/stub_main.c	2007-07-29 03:26:24 +0300
@@ -263,7 +263,11 @@
 	memset(busid_table, 0, sizeof(busid_table));
 	spin_lock_init(&busid_table_lock);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+	ret = driver_create_file(&stub_driver.driver, &driver_attr_match_busid);
+#else
 	ret = driver_create_file(&stub_driver.drvwrap.driver, &driver_attr_match_busid);
+#endif
 	if (ret) {
 		uerr("create driver sysfs\n");
 		return ret;
@@ -276,7 +280,11 @@
 {
 	udbg("enter\n");
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+	driver_remove_file(&stub_driver.driver, &driver_attr_match_busid);
+#else
 	driver_remove_file(&stub_driver.drvwrap.driver, &driver_attr_match_busid);
+#endif
 
 	/*
 	 * deregister() calls stub_disconnect() for all devices. Device
diff -urN kernel-source-usbip-0.1.5.orig/usbip_common.h kernel-source-usbip-0.1.5/usbip_common.h
--- kernel-source-usbip-0.1.5.orig/usbip_common.h	2007-07-29 03:04:44 +0300
+++ kernel-source-usbip-0.1.5/usbip_common.h	2007-07-29 03:26:33 +0300
@@ -24,6 +24,7 @@
 #define  __VHCI_COMMON_H
 
 
+#include <linux/version.h>
 #include <linux/usb.h>
 #include <net/sock.h>
 #include <asm/byteorder.h>
diff -urN kernel-source-usbip-0.1.5.orig/vhci_hcd.c kernel-source-usbip-0.1.5/vhci_hcd.c
--- kernel-source-usbip-0.1.5.orig/vhci_hcd.c	2007-07-29 03:04:44 +0300
+++ kernel-source-usbip-0.1.5/vhci_hcd.c	2007-07-29 03:25:15 +0300
@@ -622,7 +622,11 @@
 no_need_xmit:
 
 	spin_unlock_irqrestore(&the_controller->lock, flags);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+	usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, NULL);
+#else
 	usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb);
+#endif
 
 	return 0;
 }
@@ -750,7 +754,11 @@
 	if (!vdev->ud.tcp_socket) {
 		/* tcp connection is closed */
 		uinfo("vhci_hcd: vhci_urb_dequeue() gives back urb %p\n", urb);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+		usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, NULL);
+#else
 		usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb);
+#endif
 	}
 
 	dbg_vhci_hc("leave\n");
diff -urN kernel-source-usbip-0.1.5.orig/vhci_rx.c kernel-source-usbip-0.1.5/vhci_rx.c
--- kernel-source-usbip-0.1.5.orig/vhci_rx.c	2007-07-29 03:04:44 +0300
+++ kernel-source-usbip-0.1.5/vhci_rx.c	2007-07-29 03:25:15 +0300
@@ -106,7 +106,11 @@
 
 
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+	usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, NULL);
+#else
 	usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb);
+#endif
 
 
 	dbg_vhci_rx("Leave\n");
@@ -166,7 +170,11 @@
 		/* If unlink is succeed, status is -ECONNRESET */
 		urb->status = pdu->u.ret_unlink.status;
 		uinfo("%d\n", urb->status);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+		usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, NULL);
+#else
 		usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb);
+#endif
 	}
 
 	kfree(unlink);