diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-07 18:38:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-07 18:38:56 +0200 |
| commit | 9eb34302681d3f6cf0b186aae31ba08cbd5f22fb (patch) | |
| tree | 4cae22049ea71aa548c885671fe252d1bd8248fe /arch | |
| parent | 9d7db2b2cb507f31ff29e339e9ed2f825edb555d (diff) | |
| parent | 04c09a15f5c3a1f468cb8daf570eec3af21940ed (diff) | |
| download | linux-3.10-9eb34302681d3f6cf0b186aae31ba08cbd5f22fb.tar.gz linux-3.10-9eb34302681d3f6cf0b186aae31ba08cbd5f22fb.tar.bz2 linux-3.10-9eb34302681d3f6cf0b186aae31ba08cbd5f22fb.zip | |
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/ssi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/ssi.h b/arch/arm/plat-mxc/include/mach/ssi.h index c34ded523f1..63f3c280423 100644 --- a/arch/arm/plat-mxc/include/mach/ssi.h +++ b/arch/arm/plat-mxc/include/mach/ssi.h @@ -10,6 +10,9 @@ struct imx_ssi_platform_data { unsigned int flags; #define IMX_SSI_DMA (1 << 0) #define IMX_SSI_USE_AC97 (1 << 1) +#define IMX_SSI_NET (1 << 2) +#define IMX_SSI_SYN (1 << 3) +#define IMX_SSI_USE_I2S_SLAVE (1 << 4) void (*ac97_reset) (struct snd_ac97 *ac97); void (*ac97_warm_reset)(struct snd_ac97 *ac97); }; |