Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / starfire.c

diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index bcc430bd9e493b0f89d0f0c85cae54debfcb9d86..7b7b1717b0d161e86d03da072a339a88dfef1d41 100644 (file)
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -216,7 +216,7 @@ do { \
 
 
 /* These identify the driver base version and may not be removed. */
-static const char version[] __devinitdata =
+static char version[] =
 KERN_INFO "starfire.c:v1.03 7/26/2000  Written by Donald Becker <becker@scyld.com>\n"
 KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";
 
@@ -1472,13 +1472,12 @@ static int __netdev_rx(struct net_device *dev, int *quota)
 #ifndef final_version                  /* Remove after testing. */
                /* You will want this info for the initial debug. */
                if (debug > 5) {
-                       DECLARE_MAC_BUF(mac);
-                       DECLARE_MAC_BUF(mac2);
-
-                       printk(KERN_DEBUG "  Rx data %s %s"
+                       printk(KERN_DEBUG "  Rx data " MAC_FMT " " MAC_FMT
                               " %2.2x%2.2x.\n",
-                              print_mac(mac, &skb->data[0]),
-                              print_mac(mac2, &skb->data[6]),
+                              skb->data[0], skb->data[1], skb->data[2],
+                              skb->data[3], skb->data[4], skb->data[5],
+                              skb->data[6], skb->data[7], skb->data[8],
+                              skb->data[9], skb->data[10], skb->data[11],
                               skb->data[12], skb->data[13]);
                }
 #endif
@@ -1742,7 +1741,7 @@ static void set_rx_mode(struct net_device *dev)
                        if (vlan_group_get_device(np->vlgrp, i)) {
                                if (vlan_count >= 32)
                                        break;
-                               writew(cpu_to_be16(i), filter_addr);
+                               writew(i, filter_addr);
                                filter_addr += 16;
                                vlan_count++;
                        }