diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 21:56:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-15 21:56:37 +0200 |
| commit | 62778396020a29d742abf980c1e83f3df4b5426e (patch) | |
| tree | 08dc01019a1afe6ed16ab79c627ecd81caea52e0 /include/sound/soc.h | |
| parent | ARM: i.MX53: Fix IOMUX type o's (diff) | |
| parent | ARM: mxs-dma: include <linux/dmaengine.h> (diff) | |
| download | linux-62778396020a29d742abf980c1e83f3df4b5426e.tar.xz linux-62778396020a29d742abf980c1e83f3df4b5426e.zip | |
Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index f1de3e0c75bc..3a4bd3a3c68d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -248,8 +248,7 @@ typedef int (*hw_write_t)(void *,const char* ,int); extern struct snd_ac97_bus_ops soc_ac97_ops; enum snd_soc_control_type { - SND_SOC_CUSTOM = 1, - SND_SOC_I2C, + SND_SOC_I2C = 1, SND_SOC_SPI, }; |