wok diff tazndis/stuff/tazndis @ rev 6834

merge
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Oct 19 21:24:30 2010 +0000 (2010-10-19)
parents 5117bf553562
children
line diff
     1.1 --- a/tazndis/stuff/tazndis	Sun Dec 28 23:59:28 2008 +0100
     1.2 +++ b/tazndis/stuff/tazndis	Tue Oct 19 21:24:30 2010 +0000
     1.3 @@ -996,7 +996,7 @@
     1.4  		    $card->{subvendor} eq $subvendor and
     1.5  		    $card->{subdevice} eq $subdevice and
     1.6  		    $busid eq $WRAP_PCI_BUS) {
     1.7 -		    $ret .= "\n\tdevice ($vendor:$device" .
     1.8 +		    $ret .= " : device ($vendor:$device" .
     1.9  		      ":$subvendor:$subdevice) present";
    1.10  		    $conf = 2;
    1.11  		    last;
    1.12 @@ -1011,7 +1011,7 @@
    1.13  		    $card->{device} eq $device and
    1.14  		    ($busid eq $WRAP_USB_BUS or $busid eq 0 or
    1.15  		     $busid eq $WRAP_PCI_BUS)) {
    1.16 -		    $ret .= "\n\tdevice ($vendor:$device) present";
    1.17 +		    $ret .= " : device ($vendor:$device) present";
    1.18  		    $conf = 2;
    1.19  		    last;
    1.20  		}