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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 70705d1306b9..d9d056d207f3 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -51,7 +51,7 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.
  *      circular buffer queues.
  *
  *      The mailboxes can be used for controlling how the card traverses
- *      its buffer rings, but are used only for inital setup in this
+ *      its buffer rings, but are used only for initial setup in this
  *      implementation.  The exec mailbox allows a variety of commands to
  *      be executed. Each command must complete before the next is
  *      executed. Primarily we use the exec mailbox for controlling the
@@ -317,13 +317,13 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
         u8 POS;
         u32 base;
         struct mc32_local *lp = netdev_priv(dev);
-        static u16 mca_io_bases[]={
+        static const u16 mca_io_bases[] = {
                 0x7280,0x7290,
                 0x7680,0x7690,
                 0x7A80,0x7A90,
                 0x7E80,0x7E90
         };
-        static u32 mca_mem_bases[]={
+        static const u32 mca_mem_bases[] = {
                 0x00C0000,
                 0x00C4000,
                 0x00C8000,
@@ -333,7 +333,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
                 0x00D8000,
                 0x00DC000
         };
-        static char *failures[]={
+        static const char * const failures[] = {
                 "Processor instruction",
                 "Processor data bus",
                 "Processor data bus",
@@ -443,7 +443,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
          *      Grab the IRQ
          */
 
-        err = request_irq(dev->irq, mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev);
+        err = request_irq(dev->irq, mc32_interrupt, IRQF_SHARED, DRV_NAME, dev);
         if (err) {
                 release_region(dev->base_addr, MC32_IO_EXTENT);
                 pr_err("%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);
@@ -522,7 +522,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
         lp->tx_len              = lp->exec_box->data[9];   /* Transmit list count */
         lp->rx_len              = lp->exec_box->data[11];  /* Receive list count */
 
-        init_MUTEX_LOCKED(&lp->cmd_mutex);
+        sema_init(&lp->cmd_mutex, 0);
         init_completion(&lp->execution_cmd);
         init_completion(&lp->xceiver_cmd);
 
@@ -813,7 +813,7 @@ static void mc32_flush_rx_ring(struct net_device *dev)
  *
  *      This sets up the host transmit data-structures.
  *
- *      First, we obtain from the card it's current postion in the tx
+ *      First, we obtain from the card it's current position in the tx
  *      ring, so that we will know where to begin transmitting
  *      packets.
  *