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

Conflicts:
	litmus/sched_cedf.c

2 files changed, 12 insertions, 2 deletions

diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c
index d3350f383966..3df0f530f67c 100644
--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -265,7 +265,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
         if (! timeout) {
                 /* error - no ack */
                 mutex_unlock(&mgr->msg_mutex);
-                snd_printk(KERN_ERR "error: no reponse on msg %x\n", msg_frame);
+                snd_printk(KERN_ERR "error: no response on msg %x\n", msg_frame);
                 return -EIO;
         }
 
@@ -278,7 +278,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
         err = get_msg(mgr, &resp, msg_frame);
 
         if( request->message_id != resp.message_id )
-                snd_printk(KERN_ERR "REPONSE ERROR!\n");
+                snd_printk(KERN_ERR "RESPONSE ERROR!\n");
 
         mutex_unlock(&mgr->msg_mutex);
         return err;
diff --git a/sound/pci/mixart/mixart_hwdep.h b/sound/pci/mixart/mixart_hwdep.h
index a46f5083db99..812e288ef2e7 100644
--- a/sound/pci/mixart/mixart_hwdep.h
+++ b/sound/pci/mixart/mixart_hwdep.h
@@ -25,11 +25,21 @@
 
 #include <sound/hwdep.h>
 
+#ifndef readl_be
 #define readl_be(x) be32_to_cpu(__raw_readl(x))
+#endif
+
+#ifndef writel_be
 #define writel_be(data,addr) __raw_writel(cpu_to_be32(data),addr)
+#endif
 
+#ifndef readl_le
 #define readl_le(x) le32_to_cpu(__raw_readl(x))
+#endif
+
+#ifndef writel_le
 #define writel_le(data,addr) __raw_writel(cpu_to_le32(data),addr)
+#endif
 
 #define MIXART_MEM(mgr,x)       ((mgr)->mem[0].virt + (x))
 #define MIXART_REG(mgr,x)       ((mgr)->mem[1].virt + (x))