diff options
author | Tony Lindgren <tony@atomide.com> | 2011-01-27 19:39:40 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-01-27 19:39:40 -0500 |
commit | 59b479e0985f0b795d68331d6443a7f89c47768d (patch) | |
tree | 25fbfacecdbe30dfe1727ac39b1c6462a9719097 /sound/soc/omap/omap-mcbsp.h | |
parent | 0e6d8cad448bde3d846961bb43db15daae94562e (diff) |
omap: Start using CONFIG_SOC_OMAP
We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
are nowadays just subcategories of these.
Search and replace the following:
ARCH_OMAP2420 SOC_OMAP2420
ARCH_OMAP2430 SOC_OMAP2430
ARCH_OMAP3430 SOC_OMAP3430
No functional changes.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Sourav Poddar <sourav.poddar@ti.com>
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.h')
-rw-r--r-- | sound/soc/omap/omap-mcbsp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h index 110c106611d3..37dc7211ed3f 100644 --- a/sound/soc/omap/omap-mcbsp.h +++ b/sound/soc/omap/omap-mcbsp.h | |||
@@ -43,7 +43,7 @@ enum omap_mcbsp_div { | |||
43 | OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */ | 43 | OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */ |
44 | }; | 44 | }; |
45 | 45 | ||
46 | #if defined(CONFIG_ARCH_OMAP2420) | 46 | #if defined(CONFIG_SOC_OMAP2420) |
47 | #define NUM_LINKS 2 | 47 | #define NUM_LINKS 2 |
48 | #endif | 48 | #endif |
49 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) | 49 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) |
@@ -54,7 +54,7 @@ enum omap_mcbsp_div { | |||
54 | #undef NUM_LINKS | 54 | #undef NUM_LINKS |
55 | #define NUM_LINKS 4 | 55 | #define NUM_LINKS 4 |
56 | #endif | 56 | #endif |
57 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) | 57 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430) |
58 | #undef NUM_LINKS | 58 | #undef NUM_LINKS |
59 | #define NUM_LINKS 5 | 59 | #define NUM_LINKS 5 |
60 | #endif | 60 | #endif |