Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 3bba835f1a21..d2bb4b254c57 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -98,7 +98,7 @@ static int rx_nocopy, rx_copy, queued_packet;
 #define WAIT_TX_AVAIL 200
 
 /* Operational parameter that usually are not changed. */
-#define TX_TIMEOUT  40          /* Time in jiffies before concluding Tx hung */
+#define TX_TIMEOUT  ((4*HZ)/10) /* Time in jiffies before concluding Tx hung */
 
 /* The size here is somewhat misleading: the Corkscrew also uses the ISA
    aliased registers at <base>+0x400.
@@ -662,7 +662,9 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
                 pr_warning(" *** Warning: this IRQ is unlikely to work! ***\n");
 
         {
-                char *ram_split[] = { "5:3", "3:1", "1:1", "3:5" };
+                static const char * const ram_split[] = {
+                        "5:3", "3:1", "1:1", "3:5"
+                };
                 __u32 config;
                 EL3WINDOW(3);
                 vp->available_media = inw(ioaddr + Wn3_Options);
@@ -734,7 +736,7 @@ static int corkscrew_open(struct net_device *dev)
                 init_timer(&vp->timer);
                 vp->timer.expires = jiffies + media_tbl[dev->if_port].wait;
                 vp->timer.data = (unsigned long) dev;
-                vp->timer.function = &corkscrew_timer;  /* timer handler */
+                vp->timer.function = corkscrew_timer;   /* timer handler */
                 add_timer(&vp->timer);
         } else
                 dev->if_port = vp->default_media;