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 /arch/arm/mach-omap2/common.c | |
| 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 'arch/arm/mach-omap2/common.c')
| -rw-r--r-- | arch/arm/mach-omap2/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 778929f7e92d..d5eaee3dff79 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c | |||
| @@ -40,7 +40,7 @@ static void __init __omap2_set_globals(struct omap_globals *omap2_globals) | |||
| 40 | 40 | ||
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #if defined(CONFIG_ARCH_OMAP2420) | 43 | #if defined(CONFIG_SOC_OMAP2420) |
| 44 | 44 | ||
| 45 | static struct omap_globals omap242x_globals = { | 45 | static struct omap_globals omap242x_globals = { |
| 46 | .class = OMAP242X_CLASS, | 46 | .class = OMAP242X_CLASS, |
| @@ -61,7 +61,7 @@ void __init omap2_set_globals_242x(void) | |||
| 61 | } | 61 | } |
| 62 | #endif | 62 | #endif |
| 63 | 63 | ||
| 64 | #if defined(CONFIG_ARCH_OMAP2430) | 64 | #if defined(CONFIG_SOC_OMAP2430) |
| 65 | 65 | ||
| 66 | static struct omap_globals omap243x_globals = { | 66 | static struct omap_globals omap243x_globals = { |
| 67 | .class = OMAP243X_CLASS, | 67 | .class = OMAP243X_CLASS, |