aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-05-11 14:24:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-27 17:43:55 -0400
commit9574507c98087951866ef30c8bf876e23ca4b99e (patch)
treecc7f4424eb34f303f39f1287d4e81f4c2948e383 /drivers/usb
parentc59bba75fa500f13ef14215d599ee0d7faa1b954 (diff)
[PATCH] USB: fix speedtch.c merge with next patch.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/atm/speedtch.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 2a1697bfd695..233f9229badb 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -386,8 +386,6 @@ static void speedtch_poll_status(struct speedtch_instance_data *instance)
386 if (instance->u.atm_dev->signal != ATM_PHY_SIG_LOST) { 386 if (instance->u.atm_dev->signal != ATM_PHY_SIG_LOST) {
387 instance->u.atm_dev->signal = ATM_PHY_SIG_LOST; 387 instance->u.atm_dev->signal = ATM_PHY_SIG_LOST;
388 printk(KERN_NOTICE "ADSL line is down\n"); 388 printk(KERN_NOTICE "ADSL line is down\n");
389 /* It'll never resync again unless we ask it to... */
390 speedtch_start_synchro(instance);
391 } 389 }
392 break; 390 break;
393 391