diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 13:03:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 13:03:35 -0700 |
| commit | 155dbfd8846bf165bb036c4492ad121c8b059f1d (patch) | |
| tree | 93c1140ecece7daac04da8a980d7b1d1e0c36bb0 /include | |
| parent | 15e0c694367332d7e7114c7c73044bc5fed9ee48 (diff) | |
| parent | d2a5b9d45f31bf5e5a1b89a87421e218ebe1a6ba (diff) | |
| download | linux-155dbfd8846bf165bb036c4492ad121c8b059f1d.tar.gz | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa of HEAD
* HEAD:
[ALSA] Fix undefined (missing) references in ISA MIRO sound driver
[ALSA] make sound/isa/gus/gusextreme.c:devices static
[ALSA] hda-codec - Fix missing array terminators in AD1988 codec support
[ALSA] Fix a deadlock in snd-rtctimer
[ALSA] Fix section mismatch errors in ALSA PCI drivers
[ALSA] remove unused snd_minor.name field
[ALSA] Fix no mpu401 interface can cause hard freeze
[ALSA] wavefront: fix __init/__devinit confusion
[ALSA] Fix workaround for AD1988A rev2 codec
[ALSA] trivial: Code clean up of i2c/cs8427.c
[ALSA] sound/i2c/cs8427.c: don't export a static function
[ALSA] intel8x0 - Add ac97 quirk for Tyan Thunder K8WE board
[ALSA] Reduce the string length of Terratec Aureon 7.1 Universe
[ALSA] sound/pci/Kconfig - fix broken indenting for SND_FM801_TEA575X
[ALSA] fix the SND_FM801_TEA575X dependencies
[ALSA] Memory leak in sound/pcmcia/pdaudiocf/pdaudiocf.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/core.h | 2 | ||||
| -rw-r--r-- | include/sound/cs46xx.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 5d184be0ff728..bab3ff457e40c 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -188,8 +188,6 @@ struct snd_minor { int device; /* device number */ const struct file_operations *f_ops; /* file operations */ void *private_data; /* private data for f_ops->open */ - char name[0]; /* device name (keep at the end of - structure) */ }; /* sound.c */ diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h index 80b2979c0cba9..685928e6f65a5 100644 --- a/include/sound/cs46xx.h +++ b/include/sound/cs46xx.h @@ -1704,6 +1704,7 @@ struct snd_cs46xx { int acpi_port; struct snd_kcontrol *eapd_switch; /* for amplifier hack */ int accept_valid; /* accept mmap valid (for OSS) */ + int in_suspend; struct gameport *gameport; |