Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / drivers / usb / atm / usbatm.h

diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index fc6c2be5999c04574e506db1b01f80b07857db6f..e6887c6cf3cf5a26b7401ca4b7477b001df18b01 100644 (file)
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -175,7 +175,7 @@ struct usbatm_data {
        int disconnected;
 
        /* heavy init */
-       int thread_pid;
+       struct task_struct *thread;
        struct completion thread_started;
        struct completion thread_exited;