diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 16:36:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 16:36:46 -0700 |
commit | e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b (patch) | |
tree | c676609730533fc1b7c5e01992e46b6eaf75f99b /sound | |
parent | 548453fd107f789f5f1bc2dc13cc432ceb3b5efd (diff) | |
parent | 838cb6aba4cebcf4fcd06b90e2adf890bef884ac (diff) | |
download | kernel_samsung_espresso10-e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b.zip kernel_samsung_espresso10-e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b.tar.gz kernel_samsung_espresso10-e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
DOC: A couple corrections and clarifications in USB doc.
Generate a slightly more informative error msg for bad HZ
fix typo "is" -> "if" in Makefile
ext*: spelling fix prefered -> preferred
DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs.
KEYS: Fix the comment to match the file name in rxrpc-type.h.
RAID: remove trailing space from printk line
DMA engine: typo fixes
Remove unused MAX_NODES_SHIFT
MAINTAINERS: Clarify access to OCFS2 development mailing list.
V4L: Storage class should be before const qualifier (sn9c102)
V4L: Storage class should be before const qualifier
sonypi: Storage class should be before const qualifier
intel_menlow: Storage class should be before const qualifier
DVB: Storage class should be before const qualifier
arm: Storage class should be before const qualifier
ALSA: Storage class should be before const qualifier
acpi: Storage class should be before const qualifier
firmware_sample_driver.c: fix coding style
MAINTAINERS: Add ati_remote2 driver
...
Fixed up trivial conflicts in firmware_sample_driver.c
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/sis7019.c | 6 | ||||
-rw-r--r-- | sound/ppc/snd_ps3.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index dcd7cd0..742f118 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) 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 @@ timeout: 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/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index d8d0b4b..20d0e32 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) /* * 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), |