From 0494a01a916a475797cbc4ac99d531be5373f043 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 21 Apr 2008 22:25:51 +0000 Subject: [PATCH] --- yaml --- r: 91748 b: refs/heads/master c: 3f76d9841e9cf6dd969ff3aec96476dced9c53f8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/sis7019.c | 6 +++--- trunk/sound/ppc/snd_ps3.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 34e484fef191..8cc95b2e1a14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b299c22c8c1024a5a89d19524e24b3e1d67e9eab +refs/heads/master: 3f76d9841e9cf6dd969ff3aec96476dced9c53f8 diff --git a/trunk/sound/pci/sis7019.c b/trunk/sound/pci/sis7019.c index dcd7cd010461..742f1180c39e 100644 --- a/trunk/sound/pci/sis7019.c +++ b/trunk/sound/pci/sis7019.c @@ -920,7 +920,7 @@ static unsigned short sis_ac97_rw(struct sis7019 *sis, int codec, u32 cmd) u16 status; u16 rdy; int count; - const static u16 codec_ready[3] = { + static const u16 codec_ready[3] = { SIS_AC97_STATUS_CODEC_READY, SIS_AC97_STATUS_CODEC2_READY, SIS_AC97_STATUS_CODEC3_READY, @@ -984,7 +984,7 @@ static unsigned short sis_ac97_rw(struct sis7019 *sis, int codec, u32 cmd) static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val) { - const static u32 cmd[3] = { + static const u32 cmd[3] = { SIS_AC97_CMD_CODEC_WRITE, SIS_AC97_CMD_CODEC2_WRITE, SIS_AC97_CMD_CODEC3_WRITE, @@ -995,7 +995,7 @@ static void sis_ac97_write(struct snd_ac97 *ac97, unsigned short reg, static unsigned short sis_ac97_read(struct snd_ac97 *ac97, unsigned short reg) { - const static u32 cmd[3] = { + static const u32 cmd[3] = { SIS_AC97_CMD_CODEC_READ, SIS_AC97_CMD_CODEC2_READ, SIS_AC97_CMD_CODEC3_READ, diff --git a/trunk/sound/ppc/snd_ps3.c b/trunk/sound/ppc/snd_ps3.c index d8d0b4b2395a..20d0e328288a 100644 --- a/trunk/sound/ppc/snd_ps3.c +++ b/trunk/sound/ppc/snd_ps3.c @@ -137,7 +137,7 @@ static inline void update_mask_reg(unsigned int reg, u32 mask, u32 or_val) /* * ALSA defs */ -const static struct snd_pcm_hardware snd_ps3_pcm_hw = { +static const struct snd_pcm_hardware snd_ps3_pcm_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_NONINTERLEAVED | SNDRV_PCM_INFO_MMAP_VALID),