Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  siimage: fix kernel oops on PPC 44x

diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 98a832a7553988664a0a33c923920d04f4bad73b..51d4134b37b196307bf98480fd786e64d983e897 100644 (file)
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -92,14 +92,14 @@
 #define SMC_insw(a, r, p, l)   insw ((unsigned long *)((a) + (r)), p, l)
 # endif
 /* check if the mac in reg is valid */
-#define SMC_GET_MAC_ADDR(lp, addr)                             \
+#define SMC_GET_MAC_ADDR(addr)                                 \
        do {                                                    \
                unsigned int __v;                               \
-               __v = SMC_inw(ioaddr, ADDR0_REG(lp));           \
+               __v = SMC_inw(ioaddr, ADDR0_REG);               \
                addr[0] = __v; addr[1] = __v >> 8;              \
-               __v = SMC_inw(ioaddr, ADDR1_REG(lp));           \
+               __v = SMC_inw(ioaddr, ADDR1_REG);               \
                addr[2] = __v; addr[3] = __v >> 8;              \
-               __v = SMC_inw(ioaddr, ADDR2_REG(lp));           \
+               __v = SMC_inw(ioaddr, ADDR2_REG);               \
                addr[4] = __v; addr[5] = __v >> 8;              \
                if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) {         \
                        random_ether_addr(addr);                \

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index b58472cf76f862c16fa861b02bcb494008c00f90..d1a200ff5fd266c05e9a876e5e4e550737f77d84 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -284,7 +284,6 @@ again:
                /* Activate callback for using skbs: if this returns false it
                 * means some were used in the meantime. */
                if (unlikely(!vi->svq->vq_ops->enable_cb(vi->svq))) {
-                       printk("Unlikely: restart svq race\n");
                        vi->svq->vq_ops->disable_cb(vi->svq);
                        netif_start_queue(dev);
                        goto again;