diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 05:17:01 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 05:17:01 -0400 |
commit | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (patch) | |
tree | 47135be4252faecbc0e5508658a58f8afd197fff /sound/soc/davinci/davinci-i2s.h | |
parent | 2603798070a80d76e7e6d2992ba4ec74addcec90 (diff) | |
parent | bda7d2a862e6b788bca2d02d38a07966a9c92e48 (diff) |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/davinci/davinci-i2s.h')
-rw-r--r-- | sound/soc/davinci/davinci-i2s.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-i2s.h b/sound/soc/davinci/davinci-i2s.h index 241648ce8873..0b1e77b8c279 100644 --- a/sound/soc/davinci/davinci-i2s.h +++ b/sound/soc/davinci/davinci-i2s.h | |||
@@ -12,6 +12,11 @@ | |||
12 | #ifndef _DAVINCI_I2S_H | 12 | #ifndef _DAVINCI_I2S_H |
13 | #define _DAVINCI_I2S_H | 13 | #define _DAVINCI_I2S_H |
14 | 14 | ||
15 | /* McBSP dividers */ | ||
16 | enum davinci_mcbsp_div { | ||
17 | DAVINCI_MCBSP_CLKGDV, /* Sample rate generator divider */ | ||
18 | }; | ||
19 | |||
15 | extern struct snd_soc_dai davinci_i2s_dai; | 20 | extern struct snd_soc_dai davinci_i2s_dai; |
16 | 21 | ||
17 | #endif | 22 | #endif |