Subject: USB: fix speedtch.c merge with next patch.
From: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/atm/speedtch.c | 2 --
1 files changed, 2 deletions(-)
--- gregkh-2.6.orig/drivers/usb/atm/speedtch.c 2005-05-27 22:54:52.000000000 -0700
+++ gregkh-2.6/drivers/usb/atm/speedtch.c 2005-05-27 22:58:34.000000000 -0700
@@ -386,8 +386,6 @@
if (instance->u.atm_dev->signal != ATM_PHY_SIG_LOST) {
instance->u.atm_dev->signal = ATM_PHY_SIG_LOST;
printk(KERN_NOTICE "ADSL line is down\n");
- /* It'll never resync again unless we ask it to... */
- speedtch_start_synchro(instance);
}
break;