Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index e33ae0025b12..98657a6a330d 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -41,6 +41,7 @@
 #include <linux/wait.h>
 #include <linux/jiffies.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -3557,10 +3558,7 @@ init_card(struct atm_dev *dev)
         if (tmp) {
                 memcpy(card->atmdev->esi, tmp->dev_addr, 6);
 
-                printk("%s: ESI %02x:%02x:%02x:%02x:%02x:%02x\n",
-                       card->name, card->atmdev->esi[0], card->atmdev->esi[1],
-                       card->atmdev->esi[2], card->atmdev->esi[3],
-                       card->atmdev->esi[4], card->atmdev->esi[5]);
+                printk("%s: ESI %pM\n", card->name, card->atmdev->esi);
         }
         /*
          * XXX: </hack>