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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index c8f7090b27d3..39a11e8af4fa 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -439,7 +439,7 @@ static u8 mac_reader[] = {
 };
 
 struct atmel_private {
-        void *card; /* Bus dependent stucture varies for PCcard */
+        void *card; /* Bus dependent structure varies for PCcard */
         int (*present_callback)(void *); /* And callback which uses it */
         char firmware_id[32];
         AtmelFWType firmware_type;
@@ -1161,7 +1161,7 @@ static irqreturn_t service_interrupt(int irq, void *dev_id)
         struct atmel_private *priv = netdev_priv(dev);
         u8 isr;
         int i = -1;
-        static u8 irq_order[] = {
+        static const u8 irq_order[] = {
                 ISR_OUT_OF_RANGE,
                 ISR_RxCOMPLETE,
                 ISR_TxCOMPLETE,
@@ -3771,7 +3771,9 @@ static int probe_atmel_card(struct net_device *dev)
 
         if (rc) {
                 if (dev->dev_addr[0] == 0xFF) {
-                        u8 default_mac[] = {0x00, 0x04, 0x25, 0x00, 0x00, 0x00};
+                        static const u8 default_mac[] = {
+                                0x00, 0x04, 0x25, 0x00, 0x00, 0x00
+                        };
                         printk(KERN_ALERT "%s: *** Invalid MAC address. UPGRADE Firmware ****\n", dev->name);
                         memcpy(dev->dev_addr, default_mac, 6);
                 }
@@ -3893,7 +3895,7 @@ static int reset_atmel_card(struct net_device *dev)
 
            This routine is also responsible for initialising some
            hardware-specific fields in the atmel_private structure,
-           including a copy of the firmware's hostinfo stucture
+           including a copy of the firmware's hostinfo structure
            which is the route into the rest of the firmware datastructures. */
 
         struct atmel_private *priv = netdev_priv(dev);