Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

4 files changed, 8 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 19a9a1c53037..302b31960008 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2161,7 +2161,7 @@ UltraSPARC (sparc64):
 P:      David S. Miller
 M:      davem@davemloft.net
 P:      Eddie C. Dost
-M:      ecd@skynet.be
+M:      ecd@brainaid.de
 P:      Jakub Jelinek
 M:      jj@sunsite.ms.mff.cuni.cz
 P:      Anton Blanchard
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 74a2e0808cbc..daa2fb93052c 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -917,7 +917,8 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off,
                         int count, int *eof, void *data)
 {
         struct ino_bucket *bp = ivector_table + (long)data;
-        struct irqaction *ap = bp->irq_info;
+        struct irq_desc *desc = bp->irq_info;
+        struct irqaction *ap = desc->action;
         cpumask_t mask;
         int len;
 
@@ -935,11 +936,13 @@ static int irq_affinity_read_proc (char *page, char **start, off_t off,
 static inline void set_intr_affinity(int irq, cpumask_t hw_aff)
 {
         struct ino_bucket *bp = ivector_table + irq;
+        struct irq_desc *desc = bp->irq_info;
+        struct irqaction *ap = desc->action;
 
         /* Users specify affinity in terms of hw cpu ids.
          * As soon as we do this, handler_irq() might see and take action.
          */
-        put_smpaff_in_irqaction((struct irqaction *)bp->irq_info, hw_aff);
+        put_smpaff_in_irqaction(ap, hw_aff);
 
         /* Migration is simply done by the next cpu to service this
          * interrupt.
diff --git a/drivers/media/dvb/frontends/tda80xx.c b/drivers/media/dvb/frontends/tda80xx.c
index 032d348dafb7..88e125079ca1 100644
--- a/drivers/media/dvb/frontends/tda80xx.c
+++ b/drivers/media/dvb/frontends/tda80xx.c
@@ -27,7 +27,6 @@
 #include <linux/spinlock.h>
 #include <linux/threads.h>
 #include <linux/interrupt.h>
-#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
index b7e635544cec..56b5197d7898 100644
--- a/include/asm-sparc64/parport.h
+++ b/include/asm-sparc64/parport.h
@@ -27,12 +27,12 @@ static struct sparc_ebus_info {
 
 static __inline__ void enable_dma(unsigned int dmanr)
 {
+        ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
+
         if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
                              sparc_ebus_dmas[dmanr].addr,
                              sparc_ebus_dmas[dmanr].count))
                 BUG();
-
-        ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
 }
 
 static __inline__ void disable_dma(unsigned int dmanr)