14 files changed, 49 insertions, 28 deletions

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 5f22d70fefc0..6b18225672c7 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -779,8 +779,9 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
         strlcpy(card->driver, DRIVER_NAME, sizeof(card->driver));
         strlcpy(card->shortname, "ARM AC'97 Interface", sizeof(card->shortname));
         snprintf(card->longname, sizeof(card->longname),
-                 "%s at 0x%08lx, irq %d",
-                 card->shortname, dev->res.start, dev->irq[0]);
+                 "%s at 0x%016llx, irq %d",
+                 card->shortname, (unsigned long long)dev->res.start,
+                 dev->irq[0]);
 
         aaci = card->private_data;
         mutex_init(&aaci->ac97_sem);
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index d3cbbb047582..8b80024968be 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -160,8 +160,9 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
                 return -ENODEV;
         }
         if (pnp_port_len(device, 0) < IO_EXTENT) {
-                snd_printk(KERN_ERR "PnP port length is %ld, expected %d\n",
-                           pnp_port_len(device, 0), IO_EXTENT);
+                snd_printk(KERN_ERR "PnP port length is %llu, expected %d\n",
+                           (unsigned long long)pnp_port_len(device, 0),
+                           IO_EXTENT);
                 return -ENODEV;
         }
         port[dev] = pnp_port_start(device, 0);
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index e6945db8ed1b..af60b0bc8115 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -2088,7 +2088,8 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard,
                 kfree(cfg);
                 return -EAGAIN;
         }
-        snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0));
+        snd_printdd("pnp: port=0x%llx\n",
+                        (unsigned long long)pnp_port_start(acard->devc, 0));
         /* PnP initialization */
         pdev = acard->dev;
         pnp_init_resource_table(cfg);
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 866300f2acbb..c1c86e0fa56d 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -611,10 +611,10 @@ static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard,
         if (dma2[dev] >= 0)
                 dma2[dev] = pnp_dma(pdev, 1);
         irq[dev] = pnp_irq(pdev, 0);
-        snd_printdd("isapnp IW: sb port=0x%lx, gf1 port=0x%lx, codec port=0x%lx\n",
-                                pnp_port_start(pdev, 0),
-                                pnp_port_start(pdev, 1),
-                                pnp_port_start(pdev, 2));
+        snd_printdd("isapnp IW: sb port=0x%llx, gf1 port=0x%llx, codec port=0x%llx\n",
+                        (unsigned long long)pnp_port_start(pdev, 0),
+                        (unsigned long long)pnp_port_start(pdev, 1),
+                        (unsigned long long)pnp_port_start(pdev, 2));
         snd_printdd("isapnp IW: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev], irq[dev]);
 #ifdef SNDRV_STB
         /* Tone Control initialization */
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 7f7f05fa518a..d64e67f2bafa 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -327,7 +327,8 @@ static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
                         goto __wt_error; 
                 } 
                 awe_port[dev] = pnp_port_start(pdev, 0);
-                snd_printdd("pnp SB16: wavetable port=0x%lx\n", pnp_port_start(pdev, 0));
+                snd_printdd("pnp SB16: wavetable port=0x%llx\n",
+                                (unsigned long long)pnp_port_start(pdev, 0));
         } else {
 __wt_error:
                 if (pdev) {
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 3b8cdbca2636..f4980ca5c05c 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -493,6 +493,19 @@ config SOUND_CS4232
           See <file:Documentation/sound/oss/CS4232> for more information on
           configuring this card.
 
+config SOUND_SSCAPE
+        tristate "Ensoniq SoundScape support"
+        depends on SOUND_OSS
+        help
+          Answer Y if you have a sound card based on the Ensoniq SoundScape
+          chipset. Such cards are being manufactured at least by Ensoniq, Spea
+          and Reveal (Reveal makes also other cards).
+
+          If you compile the driver into the kernel, you have to add
+          "sscape=<io>,<irq>,<dma>,<mpuio>,<mpuirq>" to the kernel command
+          line.
+
+
 config SOUND_VMIDI
         tristate "Loopback MIDI device support"
         depends on SOUND_OSS
diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c
index c7f86f09c28d..80f6c08e26e7 100644
--- a/sound/oss/cs4232.c
+++ b/sound/oss/cs4232.c
@@ -405,7 +405,7 @@ static const struct pnp_device_id cs4232_pnp_table[] = {
 
 MODULE_DEVICE_TABLE(pnp, cs4232_pnp_table);
 
-static int cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
+static int __init cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 {
         struct address_info *isapnpcfg;
 
diff --git a/sound/oss/forte.c b/sound/oss/forte.c
index 0294eec8ad90..44e578098d76 100644
--- a/sound/oss/forte.c
+++ b/sound/oss/forte.c
@@ -2035,8 +2035,9 @@ forte_probe (struct pci_dev *pci_dev, const struct pci_device_id *pci_id)
         
         pci_set_drvdata (pci_dev, chip);
 
-        printk (KERN_INFO PFX "FM801 chip found at 0x%04lX-0x%04lX IRQ %u\n", 
-                chip->iobase, pci_resource_end (pci_dev, 0), chip->irq);
+        printk (KERN_INFO PFX "FM801 chip found at 0x%04lX-0x%16llX IRQ %u\n",
+                chip->iobase, (unsigned long long)pci_resource_end (pci_dev, 0),
+                chip->irq);
 
         /* Power it up */
         if ((ret = forte_chip_init (chip)) == 0)
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index 2343dedd44ae..29a6e0cff79f 100644
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -309,7 +309,7 @@ struct via_info {
         unsigned sixchannel: 1; /* 8233/35 with 6 channel support */
         unsigned volume: 1;
 
-        int locked_rate : 1;
+        unsigned locked_rate : 1;
         
         int mixer_vol;          /* 8233/35 volume  - not yet implemented */
 
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index c33642d8d9a1..497ed6b20060 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -888,8 +888,9 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,
 
         strcpy(card->driver, "Bt87x");
         sprintf(card->shortname, "Brooktree Bt%x", pci->device);
-        sprintf(card->longname, "%s at %#lx, irq %i",
-                card->shortname, pci_resource_start(pci, 0), chip->irq);
+        sprintf(card->longname, "%s at %#llx, irq %i",
+                card->shortname, (unsigned long long)pci_resource_start(pci, 0),
+                chip->irq);
         strcpy(card->mixername, "Bt87x");
 
         err = snd_card_register(card);
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index dcf402948347..e5511606af04 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1441,10 +1441,10 @@ static int __devinit snd_sonic_probe(struct pci_dev *pci,
 
         strcpy(card->driver, "SonicVibes");
         strcpy(card->shortname, "S3 SonicVibes");
-        sprintf(card->longname, "%s rev %i at 0x%lx, irq %i",
+        sprintf(card->longname, "%s rev %i at 0x%llx, irq %i",
                 card->shortname,
                 sonic->revision,
-                pci_resource_start(pci, 1),
+                (unsigned long long)pci_resource_start(pci, 1),
                 sonic->irq);
 
         if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index b678814975c9..be98f6377339 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -1170,9 +1170,10 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                                                chip->rsrc[i].start + 1,
                                                rnames[i]) == NULL) {
                                 printk(KERN_ERR "snd: can't request rsrc "
-                                       " %d (%s: 0x%08lx:%08lx)\n",
-                                       i, rnames[i], chip->rsrc[i].start,
-                                       chip->rsrc[i].end);
+                                       " %d (%s: 0x%016lx:%016lx)\n",
+                                       i, rnames[i],
+                                       (unsigned long long)chip->rsrc[i].start,
+                                       (unsigned long long)chip->rsrc[i].end);
                                 err = -ENODEV;
                                 goto __error;
                         }
@@ -1201,9 +1202,10 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                                                chip->rsrc[i].start + 1,
                                                rnames[i]) == NULL) {
                                 printk(KERN_ERR "snd: can't request rsrc "
-                                       " %d (%s: 0x%08lx:%08lx)\n",
-                                       i, rnames[i], chip->rsrc[i].start,
-                                       chip->rsrc[i].end);
+                                       " %d (%s: 0x%016llx:%016llx)\n",
+                                       i, rnames[i],
+                                       (unsigned long long)chip->rsrc[i].start,
+                                       (unsigned long long)chip->rsrc[i].end);
                                 err = -ENODEV;
                                 goto __error;
                         }
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index da54d04a3e3a..d9d14c2707db 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2037,10 +2037,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..a7489a3dd75a 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -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);