diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
| commit | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch) | |
| tree | 9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /linux/src/drivers/net/3c505.c | |
| parent | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff) | |
| parent | 51e87d005139a435cd846ac5c224eed5042c4fa0 (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'linux/src/drivers/net/3c505.c')
| -rw-r--r-- | linux/src/drivers/net/3c505.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/src/drivers/net/3c505.c b/linux/src/drivers/net/3c505.c index b2163ecc..d78dad5b 100644 --- a/linux/src/drivers/net/3c505.c +++ b/linux/src/drivers/net/3c505.c @@ -1408,7 +1408,7 @@ static int elp_sense(struct device *dev) /* Wait for a while; the adapter may still be booting up */ if (elp_debug > 0) - printk(stilllooking_msg); + printk("%s", stilllooking_msg); if (orig_HCR & DIR) { /* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */ outb_control(orig_HCR & ~DIR, addr); @@ -1439,7 +1439,7 @@ static int elp_sense(struct device *dev) * a hard reset. Also, do a hard reset if selected at the compile time. */ if (elp_debug > 0) - printk(found_msg); + printk("%s", found_msg); return 0; } |