From 84f9800cb86b084a933461fd5003691ec5f1c13c Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 25 Oct 2010 16:44:20 +0000 Subject: [PATCH] --- yaml --- r: 218446 b: refs/heads/master c: 1941bf8c8d9392b18cd9bfed8050a2d78850aede h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/atm/eni.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fcbde796ffd4..00240ec1690a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2dc0d1809ab7e0147c7e4ac837be1682f706538 +refs/heads/master: 1941bf8c8d9392b18cd9bfed8050a2d78850aede diff --git a/trunk/drivers/atm/eni.c b/trunk/drivers/atm/eni.c index 80f9f3659e4d..97c5898cd76e 100644 --- a/trunk/drivers/atm/eni.c +++ b/trunk/drivers/atm/eni.c @@ -1736,9 +1736,10 @@ static int __devinit eni_do_init(struct atm_dev *dev) eprom = (base+EPROM_SIZE-sizeof(struct midway_eprom)); if (readl(&eprom->magic) != ENI155_MAGIC) { printk("\n"); - printk(KERN_ERR KERN_ERR DEV_LABEL "(itf %d): bad " - "magic - expected 0x%x, got 0x%x\n",dev->number, - ENI155_MAGIC,(unsigned) readl(&eprom->magic)); + printk(KERN_ERR DEV_LABEL + "(itf %d): bad magic - expected 0x%x, got 0x%x\n", + dev->number, ENI155_MAGIC, + (unsigned)readl(&eprom->magic)); error = -EINVAL; goto unmap; }