diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-16 12:57:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-16 12:57:59 -0700 |
| commit | a34689d98059f0c88cef08a78866e81eb53466c9 (patch) | |
| tree | 5501c1c2b8b5adbc4492f703709e6ae7996d14a5 /include/linux | |
| parent | 37407ea7f93864c2cfc03edf8f37872ec539ea2b (diff) | |
| parent | 5d037f9064a8f3b9abbe383cdfb35e159d813711 (diff) | |
| download | linux-3.10-a34689d98059f0c88cef08a78866e81eb53466c9.tar.gz linux-3.10-a34689d98059f0c88cef08a78866e81eb53466c9.tar.bz2 linux-3.10-a34689d98059f0c88cef08a78866e81eb53466c9.zip | |
Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull more sound fixes from Takashi Iwai:
"Yet more (a bunch of) small fixes that slipped from the previous pull
request. Most of commits are pending ASoC fixes, all of which are
fairly trivial commits."
* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: wm8904: correct the index
ALSA: hda - Yet another position_fix quirk for ASUS machines
ASoC: tegra: fix maxburst settings in dmaengine code
ASoC: samsung dma - Don't indicate support for pause/resume.
ASoC: mc13783: Remove mono support
ASoC: arizona: Fix typo in 44.1kHz rates
ASoC: spear: correct the check for NULL dma_buffer pointer
sound: tegra_alc5632: remove HP detect GPIO inversion
ASoC: atmel-ssc: include linux/io.h for raw io
ASoC: dapm: Don't force card bias level to be updated
ASoC: dapm: Make sure we update the bias level for CODECs with no op
ASoC: am3517evm: fix error return code
ASoC: ux500_msp_i2s: better use devm functions and fix error return code
ASoC: imx-sgtl5000: fix error return code
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/atmel-ssc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/atmel-ssc.h b/include/linux/atmel-ssc.h index 06023393fba..4eb31752e2b 100644 --- a/include/linux/atmel-ssc.h +++ b/include/linux/atmel-ssc.h @@ -3,6 +3,7 @@ #include <linux/platform_device.h> #include <linux/list.h> +#include <linux/io.h> struct ssc_device { struct list_head list; |