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

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

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 1776ab61b05fffedc7a18eaa755de9a64451f15f..9e1c03eb97ae5e3ce05de34b0aae69c2b3507680 100644 (file)
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -158,8 +158,8 @@ static int mem_start;
 struct net_device * __init el1_probe(int unit)
 {
        struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
-       static unsigned ports[] = { 0x280, 0x300, 0};
-       unsigned *port;
+       static const unsigned ports[] = { 0x280, 0x300, 0};
+       const unsigned *port;
        int err = 0;
 
        if (!dev)