diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-12 07:20:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-12 07:20:30 +0100 |
| commit | 2f55eaab56ea083498034c18e09d356594081fca (patch) | |
| tree | 41563dd4dfe981514915dfcf57e5a5b298c82b6a /sound/soc/omap/omap-mcbsp.h | |
| parent | 03cfbdf9f7a1d392146718f67e50fa9ab2844f22 (diff) | |
| parent | 559a8cd629f1b797732fd97afd58b41d8b6fb312 (diff) | |
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.h')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h index ffdcc5abb7b..110c106611d 100644 --- a/sound/soc/omap/omap-mcbsp.h +++ b/sound/soc/omap/omap-mcbsp.h @@ -50,6 +50,10 @@ enum omap_mcbsp_div { #undef NUM_LINKS #define NUM_LINKS 3 #endif +#if defined(CONFIG_ARCH_OMAP4) +#undef NUM_LINKS +#define NUM_LINKS 4 +#endif #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) #undef NUM_LINKS #define NUM_LINKS 5 |