8 files changed, 39 insertions, 29 deletions

diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 103f136926d9..4ef6dd00c6ee 100644
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -2,12 +2,14 @@
 # Makefile for ALSA
 #
 
-snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
-snd-aaci-objs                   := aaci.o devdma.o
-snd-pxa2xx-pcm-objs := pxa2xx-pcm.o
-snd-pxa2xx-ac97-objs := pxa2xx-ac97.o
-
 obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o 
+snd-sa11xx-uda1341-objs         := sa11xx-uda1341.o
+
 obj-$(CONFIG_SND_ARMAACI)       += snd-aaci.o
-obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o
-obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
+snd-aaci-objs                   := aaci.o devdma.o
+
+obj-$(CONFIG_SND_PXA2XX_PCM)    += snd-pxa2xx-pcm.o
+snd-pxa2xx-pcm-objs             := pxa2xx-pcm.o
+
+obj-$(CONFIG_SND_PXA2XX_AC97)   += snd-pxa2xx-ac97.o
+snd-pxa2xx-ac97-objs            := pxa2xx-ac97.o
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 08cc3ddca96f..98877030d579 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -821,7 +821,7 @@ static int __devinit aaci_init_pcm(struct aaci *aaci)
 
 static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
 {
-        void *base = aaci->base + AACI_CSCH1;
+        void __iomem *base = aaci->base + AACI_CSCH1;
         int i;
 
         writel(TXCR_FEN | TXCR_TSZ16 | TXCR_TXEN, base + AACI_TXCR);
@@ -877,7 +877,7 @@ static int __devinit aaci_probe(struct amba_device *dev, void *id)
         aaci->playback.fifo = aaci->base + AACI_DR1;
 
         for (i = 0; i < 4; i++) {
-                void *base = aaci->base + i * 0x14;
+                void __iomem *base = aaci->base + i * 0x14;
 
                 writel(0, base + AACI_IE);
                 writel(0, base + AACI_TXCR);
diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index d752e6426894..b2f969bc7845 100644
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -200,8 +200,8 @@
 
 
 struct aaci_runtime {
-        void                    *base;
-        void                    *fifo;
+        void                    __iomem *base;
+        void                    __iomem *fifo;
 
         struct ac97_pcm         *pcm;
         int                     pcm_open;
@@ -223,7 +223,7 @@ struct aaci_runtime {
 struct aaci {
         struct amba_device      *dev;
         snd_card_t              *card;
-        void                    *base;
+        void                    __iomem *base;
         unsigned int            fifosize;
 
         /* AC'97 */
diff --git a/sound/core/memory.c b/sound/core/memory.c
index 1622893d00a2..291b4769bde3 100644
--- a/sound/core/memory.c
+++ b/sound/core/memory.c
@@ -116,15 +116,21 @@ void *snd_hidden_kmalloc(size_t size, unsigned int __nocast flags)
         return _snd_kmalloc(size, flags);
 }
 
+void *snd_hidden_kzalloc(size_t size, unsigned int __nocast flags)
+{
+        void *ret = _snd_kmalloc(size, flags);
+        if (ret)
+                memset(ret, 0, size);
+        return ret;
+}
+EXPORT_SYMBOL(snd_hidden_kzalloc);
+
 void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags)
 {
         void *ret = NULL;
         if (n != 0 && size > INT_MAX / n)
                 return ret;
-        ret = _snd_kmalloc(n * size, flags);
-        if (ret)
-                memset(ret, 0, n * size);
-        return ret;
+        return snd_hidden_kzalloc(n * size, flags);
 }
 
 void snd_hidden_kfree(const void *obj)
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index be4ea60a3679..5c3948311528 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -15,7 +15,8 @@ config SND_CS4231_LIB
 
 config SND_AD1816A
         tristate "Analog Devices SoundPort AD1816A"
-        depends on SND && ISAPNP
+        depends on SND && PNP && ISA
+        select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_PCM
@@ -80,7 +81,8 @@ config SND_CS4236
 
 config SND_ES968
         tristate "Generic ESS ES968 driver"
-        depends on SND && ISAPNP
+        depends on SND && PNP && ISA
+        select ISAPNP
         select SND_MPU401_UART
         select SND_PCM
         help
@@ -160,7 +162,7 @@ config SND_GUSMAX
 
 config SND_INTERWAVE
         tristate "AMD InterWave, Gravis UltraSound PnP"
-        depends on SND
+        depends on SND && PNP && ISA
         select SND_RAWMIDI
         select SND_CS4231_LIB
         select SND_GUS_SYNTH
@@ -175,7 +177,7 @@ config SND_INTERWAVE
 
 config SND_INTERWAVE_STB
         tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
-        depends on SND
+        depends on SND && PNP && ISA
         select SND_RAWMIDI
         select SND_CS4231_LIB
         select SND_GUS_SYNTH
@@ -291,7 +293,8 @@ config SND_WAVEFRONT
 
 config SND_ALS100
         tristate "Avance Logic ALS100/ALS120"
-        depends on SND && ISAPNP
+        depends on SND && PNP && ISA
+        select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_PCM
@@ -304,7 +307,8 @@ config SND_ALS100
 
 config SND_AZT2320
         tristate "Aztech Systems AZT2320"
-        depends on SND && ISAPNP
+        depends on SND && PNP && ISA
+        select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_CS4231_LIB
@@ -328,7 +332,8 @@ config SND_CMI8330
 
 config SND_DT019X
         tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
-        depends on SND && ISAPNP
+        depends on SND && PNP && ISA
+        select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_PCM
diff --git a/sound/oss/os.h b/sound/oss/os.h
index d6b96297835c..80dce329cc3a 100644
--- a/sound/oss/os.h
+++ b/sound/oss/os.h
@@ -19,9 +19,6 @@
 #include <linux/ioport.h>
 #include <asm/page.h>
 #include <asm/system.h>
-#ifdef __alpha__
-#include <asm/segment.h>
-#endif
 #include <linux/vmalloc.h>
 #include <asm/uaccess.h>
 #include <linux/poll.h>
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index ce6c9fadb594..4943299cf137 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2249,7 +2249,7 @@ static int __devinit snd_ali_create(snd_card_t * card,
                 return -ENXIO;
         }
 
-        if ((codec = kcalloc(1, sizeof(*codec), GFP_KERNEL)) == NULL) {
+        if ((codec = kzalloc(sizeof(*codec), GFP_KERNEL)) == NULL) {
                 pci_disable_device(pci);
                 return -ENOMEM;
         }
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 904d17394e1c..188df085b7ee 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1427,7 +1427,7 @@ static int snd_atiixp_suspend(snd_card_t *card, pm_message_t state)
         snd_atiixp_aclink_down(chip);
         snd_atiixp_chip_stop(chip);
 
-        pci_set_power_state(chip->pci, 3);
+        pci_set_power_state(chip->pci, PCI_D3hot);
         pci_disable_device(chip->pci);
         return 0;
 }
@@ -1438,7 +1438,7 @@ static int snd_atiixp_resume(snd_card_t *card)
         int i;
 
         pci_enable_device(chip->pci);
-        pci_set_power_state(chip->pci, 0);
+        pci_set_power_state(chip->pci, PCI_D0);
         pci_set_master(chip->pci);
 
         snd_atiixp_aclink_reset(chip);