Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

3 files changed, 8 insertions, 9 deletions

diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index ba1b2a3443d3..db3e22efd02e 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -973,7 +973,7 @@ static int __init snd_amd7930_create(struct snd_card *card,
         amd7930_idle(amd);
 
         if (request_irq(irq, snd_amd7930_interrupt,
-                        SA_INTERRUPT | SA_SHIRQ, "amd7930", amd)) {
+                        IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) {
                 snd_printk("amd7930-%d: Unable to grab IRQ %d\n",
                            dev, irq);
                 snd_amd7930_free(amd);
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index da54d04a3e3a..5018fcf41df5 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -8,7 +8,6 @@
  * Copyright (c) by Jaroslav Kysela <perex@suse.cz>
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -2002,7 +2001,7 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
         chip->c_dma.preallocate = sbus_dma_preallocate;
 
         if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
-                        SA_SHIRQ, "cs4231", chip)) {
+                        IRQF_SHARED, "cs4231", chip)) {
                 snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
                             dev, sdev->irqs[0]);
                 snd_cs4231_sbus_free(chip);
@@ -2037,10 +2036,10 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
         if (err)
                 return err;
 
-        sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d",
+        sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d",
                 card->shortname,
                 rp->flags & 0xffL,
-                rp->start,
+                (unsigned long long)rp->start,
                 sdev->irqs[0]);
 
         if ((err = snd_cs4231_sbus_create(card, sdev, dev, &cp)) < 0) {
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 5eecdd09a79d..59a02a0d9afc 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -46,7 +46,7 @@
  *
  * I've tried to stick to the following function naming conventions:
  * snd_*        ALSA stuff
- * cs4215_*     CS4215 codec specfic stuff
+ * cs4215_*     CS4215 codec specific stuff
  * dbri_*       DBRI high-level stuff
  * other        DBRI low-level stuff
  */
@@ -2569,7 +2569,7 @@ static int __init snd_dbri_create(struct snd_card *card,
                 return -EIO;
         }
 
-        err = request_irq(dbri->irq, snd_dbri_interrupt, SA_SHIRQ,
+        err = request_irq(dbri->irq, snd_dbri_interrupt, IRQF_SHARED,
                           "DBRI audio", dbri);
         if (err) {
                 printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq);
@@ -2645,9 +2645,9 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
         strcpy(card->driver, "DBRI");
         strcpy(card->shortname, "Sun DBRI");
         rp = &sdev->resource[0];
-        sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d",
+        sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d",
                 card->shortname,
-                rp->flags & 0xffL, rp->start, irq.pri);
+                rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri);
 
         if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) {
                 snd_card_free(card);