diff --git a/[refs] b/[refs] index cb9a270bef7a..690ae5df4555 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98683956acea08858a3326eb4d61e5cf40c67fe2 +refs/heads/master: 6a64cd64c056d46b419bb07b02153b00df97a2c5 diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 8b7f8b77e5e0..e3b7305e8b8c 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -940,7 +940,7 @@ static int reg_delay(struct net_device *dev, int offset, u32 mask, u32 target, delaymax -= delay; if (delaymax < 0) { if (msg) - printk(msg); + printk("%s", msg); return 1; } } while ((readl(base + offset) & mask) != target);