Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index cbe15a86c669..4e8ba56f75d3 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1255,7 +1255,7 @@ static inline void lanai_endtx(struct lanai_dev *lanai,
         /*
          * Since the "butt register" is a shared resounce on the card we
          * serialize all accesses to it through this spinlock.  This is
-         * mostly just paranoia sicne the register is rarely "busy" anyway
+         * mostly just paranoia since the register is rarely "busy" anyway
          * but is needed for correctness.
          */
         spin_lock(&lanai->endtxlock);
@@ -1990,7 +1990,7 @@ static int __devinit lanai_pci_start(struct lanai_dev *lanai)
 
 /*
  * We _can_ use VCI==0 for normal traffic, but only for UBR (or we'll
- * get a CBRZERO interrupt), and we can use it only if noone is receiving
+ * get a CBRZERO interrupt), and we can use it only if no one is receiving
  * AAL0 traffic (since they will use the same queue) - according to the
  * docs we shouldn't even use it for AAL0 traffic
  */
@@ -2241,11 +2241,8 @@ static int __devinit lanai_dev_open(struct atm_dev *atmdev)
         memcpy(atmdev->esi, eeprom_mac(lanai), ESI_LEN);
         lanai_timed_poll_start(lanai);
         printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d, base=0x%lx, irq=%u "
-            "(%02X-%02X-%02X-%02X-%02X-%02X)\n", lanai->number,
-            (int) lanai->pci->revision, (unsigned long) lanai->base,
-            lanai->pci->irq,
-            atmdev->esi[0], atmdev->esi[1], atmdev->esi[2],
-            atmdev->esi[3], atmdev->esi[4], atmdev->esi[5]);
+                "(%pMF)\n", lanai->number, (int) lanai->pci->revision,
+                (unsigned long) lanai->base, lanai->pci->irq, atmdev->esi);
         printk(KERN_NOTICE DEV_LABEL "(itf %d): LANAI%s, serialno=%u(0x%X), "
             "board_rev=%d\n", lanai->number,
             lanai->type==lanai2 ? "2" : "HB", (unsigned int) lanai->serialno,
@@ -2591,7 +2588,7 @@ static int __devinit lanai_init_one(struct pci_dev *pci,
                 return -ENOMEM;
         }
 
-        atmdev = atm_dev_register(DEV_LABEL, &ops, -1, NULL);
+        atmdev = atm_dev_register(DEV_LABEL, &pci->dev, &ops, -1, NULL);
         if (atmdev == NULL) {
                 printk(KERN_ERR DEV_LABEL
                     ": couldn't register atm device!\n");