fbdev: intelfb: add support for the Intel Integrated Graphics Controller 965G/965GM

[safe/jmp/linux-2.6] / drivers / net / smc-ultra32.c

diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index ff9bd97..a5a91ac 100644 (file)
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -74,7 +74,7 @@ static void ultra32_block_output(struct net_device *dev, int count,
                                 const unsigned char *buf,
                                 const int start_page);
 static int ultra32_close(struct net_device *dev);
-\f
+
 #define ULTRA32_CMDREG 0       /* Offset to ASIC command register. */
 #define         ULTRA32_RESET  0x80    /* Board reset, in ULTRA32_CMDREG. */
 #define         ULTRA32_MEMENB 0x40    /* Enable the shared memory. */
@@ -132,8 +132,6 @@ struct net_device * __init ultra32_probe(int unit)
                netdev_boot_setup_check(dev);
        }
 
-       SET_MODULE_OWNER(dev);
-
        irq = dev->irq;
 
        /* EISA spec allows for up to 16 slots, but 8 is typical. */
@@ -165,6 +163,7 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
        unsigned char idreg;
        unsigned char reg4;
        const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"};
+       DECLARE_MAC_BUF(mac);
 
        if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME))
                return -EBUSY;
@@ -205,10 +204,11 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
 
        model_name = "SMC Ultra32";
 
-       printk("%s: %s at 0x%X,", dev->name, model_name, ioaddr);
-
        for (i = 0; i < 6; i++)
-               printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+               dev->dev_addr[i] = inb(ioaddr + 8 + i);
+
+       printk("%s: %s at 0x%X, %s",
+              dev->name, model_name, ioaddr, print_mac(mac, dev->dev_addr));
 
        /* Switch from the station address to the alternate register set and
           read the useful registers there. */
@@ -290,7 +290,7 @@ out:
 static int ultra32_open(struct net_device *dev)
 {
        int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */
-       int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 : SA_SHIRQ;
+       int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 : IRQF_SHARED;
        int retval;
 
        retval = request_irq(dev->irq, ei_interrupt, irq_flags, dev->name, dev);
@@ -314,7 +314,7 @@ static int ultra32_close(struct net_device *dev)
        int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* CMDREG */
 
        netif_stop_queue(dev);
-       
+
        if (ei_debug > 1)
                printk("%s: Shutting down ethercard.\n", dev->name);
 
@@ -395,8 +395,7 @@ static void ultra32_block_input(struct net_device *dev,
                        memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
                }
        } else {
-               /* Packet is in one chunk -- we can copy + cksum. */
-               eth_io_copy_and_sum(skb, xfer_start, count, 0);
+               memcpy_fromio(skb->data, xfer_start, count);
        }
 }
 
@@ -413,7 +412,7 @@ static void ultra32_block_output(struct net_device *dev,
 
        memcpy_toio(xfer_start, buf, count);
 }
-\f
+
 #ifdef MODULE
 #define MAX_ULTRA32_CARDS   4  /* Max number of Ultra cards per module */
 static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];
@@ -437,7 +436,7 @@ int __init init_module(void)
        return -ENXIO;
 }
 
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
        int this_dev;