|  | @@ -555,7 +555,7 @@ static int isapnp_check_driver ( struct bus_dev *bus_dev,
 | 
		
	
		
			
			| 555 | 555 |  			      isapnp->prod_id,
 | 
		
	
		
			
			| 556 | 556 |  			      isa_id_string( isapnp->vendor_id,
 | 
		
	
		
			
			| 557 | 557 |  					     isapnp->prod_id ),
 | 
		
	
		
			
			| 558 |  | -			      id->name, driver->name );
 | 
		
	
		
			
			|  | 558 | +			      id->name, device_driver->name );
 | 
		
	
		
			
			| 559 | 559 |  			isapnp->name = id->name;
 | 
		
	
		
			
			| 560 | 560 |  			return 1;
 | 
		
	
		
			
			| 561 | 561 |  		}
 | 
		
	
	
		
			
			|  | @@ -622,7 +622,8 @@ void isapnp_device_activation ( struct isapnp_device *isapnp,
 | 
		
	
		
			
			| 622 | 622 |  	/* Return all cards to Wait for Key state */
 | 
		
	
		
			
			| 623 | 623 |  	isapnp_wait_for_key ();
 | 
		
	
		
			
			| 624 | 624 |  
 | 
		
	
		
			
			| 625 |  | -	DBG ( "ISAPnP activated device %hhx.%hhx\n",
 | 
		
	
		
			
			|  | 625 | +	DBG ( "ISAPnP %s device %hhx.%hhx\n",
 | 
		
	
		
			
			|  | 626 | +	      ( activation ? "activated" : "deactivated" ),
 | 
		
	
		
			
			| 626 | 627 |  	      isapnp->csn, isapnp->logdev );
 | 
		
	
		
			
			| 627 | 628 |  }
 | 
		
	
		
			
			| 628 | 629 |  
 |