Merge nommu branch

[pandora-kernel.git] / drivers / net / smc-ultra32.c

diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index ff9bd97..e10755e 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. */
@@ -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);
 
@@ -413,7 +413,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];