aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/sis7019.c6
-rw-r--r--sound/ppc/snd_ps3.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index dcd7cd010461..742f1180c39e 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -920,7 +920,7 @@ static unsigned short sis_ac97_rw(struct sis7019 *sis, int codec, u32 cmd)
920 u16 status; 920 u16 status;
921 u16 rdy; 921 u16 rdy;
922 int count; 922 int count;
923 const static u16 codec_ready[3] = { 923 static const u16 codec_ready[3] = {
924 SIS_AC97_STATUS_CODEC_READY, 924 SIS_AC97_STATUS_CODEC_READY,
925 SIS_AC97_STATUS_CODEC2_READY, 925 SIS_AC97_STATUS_CODEC2_READY,
926 SIS_AC97_STATUS_CODEC3_READY, 926 SIS_AC97_STATUS_CODEC3_READY,
@@ -984,7 +984,7 @@ timeout:
984static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg, 984static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
985 unsigned short val) 985 unsigned short val)
986{ 986{
987 const static u32 cmd[3] = { 987 static const u32 cmd[3] = {
988 SIS_AC97_CMD_CODEC_WRITE, 988 SIS_AC97_CMD_CODEC_WRITE,
989 SIS_AC97_CMD_CODEC2_WRITE, 989 SIS_AC97_CMD_CODEC2_WRITE,
990 SIS_AC97_CMD_CODEC3_WRITE, 990 SIS_AC97_CMD_CODEC3_WRITE,
@@ -995,7 +995,7 @@ static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
995 995
996static unsigned short sis_ac97_read(struct snd_ac97 *ac97, unsigned short reg) 996static unsigned short sis_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
997{ 997{
998 const static u32 cmd[3] = { 998 static const u32 cmd[3] = {
999 SIS_AC97_CMD_CODEC_READ, 999 SIS_AC97_CMD_CODEC_READ,
1000 SIS_AC97_CMD_CODEC2_READ, 1000 SIS_AC97_CMD_CODEC2_READ,
1001 SIS_AC97_CMD_CODEC3_READ, 1001 SIS_AC97_CMD_CODEC3_READ,
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index d8d0b4b2395a..20d0e328288a 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -137,7 +137,7 @@ static inline void update_mask_reg(unsigned int reg, u32 mask, u32 or_val)
137/* 137/*
138 * ALSA defs 138 * ALSA defs
139 */ 139 */
140const static struct snd_pcm_hardware snd_ps3_pcm_hw = { 140static const struct snd_pcm_hardware snd_ps3_pcm_hw = {
141 .info = (SNDRV_PCM_INFO_MMAP | 141 .info = (SNDRV_PCM_INFO_MMAP |
142 SNDRV_PCM_INFO_NONINTERLEAVED | 142 SNDRV_PCM_INFO_NONINTERLEAVED |
143 SNDRV_PCM_INFO_MMAP_VALID), 143 SNDRV_PCM_INFO_MMAP_VALID),