diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 11:24:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 11:24:04 -0500 |
| commit | 6026179519896e7d35b2564e7544487d1c8948e7 (patch) | |
| tree | c78c7032abce24d846423572204f1cd4e97d8efc /sound/pci/ice1712/phase.h | |
| parent | d27146dd5b72ab7d7e641f56f4bee1484dabd0b7 (diff) | |
| parent | c2902c8ae06762d941fab64198467f78cab6f8cd (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (212 commits)
[PATCH] Fix breakage with CONFIG_SYSFS_DEPRECATED
[ALSA] version 1.0.14rc2
[ALSA] ASoC documentation updates
[ALSA] ca0106 - Add missing sysfs device assignment
[ALSA] aoa i2sbus: Stop Apple i2s DMA gracefully
[ALSA] hda-codec - Add support for Fujitsu PI1556 Realtek ALC880
[ALSA] aoa: remove suspend/resume printks
[ALSA] Fix possible deadlocks in sequencer at removal of ports
[ALSA] emu10k1 - Fix STAC9758 front channel
[ALSA] soc - Clean up with kmemdup()
[ALSA] snd-ak4114: Fix two array overflows
[ALSA] ac97_bus power management
[ALSA] usbaudio - Add support for Edirol UA-101
[ALSA] hda-codec - Add ALC861VD/ALC660VD support
[ALSA] soc - ASoC 0.13 Sharp poodle machine
[ALSA] soc - ASoC 0.13 Sharp tosa machine
[ALSA] soc - ASoC 0.13 spitz machine
[ALSA] soc - ASoC Sharp corgi machine
[ALSA] soc - ASoC 0.13 pxa2xx DMA
[ALSA] soc - ASoC 0.13 pxa2xx AC97 driver
...
Diffstat (limited to 'sound/pci/ice1712/phase.h')
| -rw-r--r-- | sound/pci/ice1712/phase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ice1712/phase.h b/sound/pci/ice1712/phase.h index 13e841b55488..ad379a99bf92 100644 --- a/sound/pci/ice1712/phase.h +++ b/sound/pci/ice1712/phase.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #define VT1724_SUBDEVICE_PHASE28 0x3b154911 | 31 | #define VT1724_SUBDEVICE_PHASE28 0x3b154911 |
| 32 | 32 | ||
| 33 | /* entry point */ | 33 | /* entry point */ |
| 34 | extern struct snd_ice1712_card_info snd_vt1724_phase_cards[]; | 34 | extern const struct snd_ice1712_card_info snd_vt1724_phase_cards[]; |
| 35 | 35 | ||
| 36 | /* PHASE28 GPIO bits */ | 36 | /* PHASE28 GPIO bits */ |
| 37 | #define PHASE28_SPI_MISO (1 << 21) | 37 | #define PHASE28_SPI_MISO (1 << 21) |