Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / 3c507.c

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index ea9b7a098c9bd75e2023fe7e5164f4baf7a86fee..1e945551c144e6b720c833febc903ec2860296da 100644 (file)
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -201,7 +201,7 @@ struct net_local {
 #define RX_BUF_SIZE    (1518+14+18)    /* packet+header+RBD */
 #define RX_BUF_END             (dev->mem_end - dev->mem_start)
 
-#define TX_TIMEOUT 5
+#define TX_TIMEOUT (HZ/20)
 
 /*
   That's it: only 86 bytes to set up the beast, including every extra
@@ -311,8 +311,8 @@ static int mem_start;
 struct net_device * __init el16_probe(int unit)
 {
        struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
-       static unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};
-       unsigned *port;
+       static const unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};
+       const unsigned *port;
        int err = -ENODEV;
 
        if (!dev)