diff options
author | Vaibhav Hiremath <hvaibhav@ti.com> | 2012-07-05 11:05:15 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-07-05 11:05:15 -0400 |
commit | ecc46cfdad7499a21296f0757059c4965f1fbc98 (patch) | |
tree | c040dbcf69fc66b809893bfd4963fb72904be757 /arch/arm/mach-omap2/Makefile | |
parent | 971b8a9c3eeb798f6201299728fdbb04ebb681c6 (diff) |
ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
The function __omap2_set_globals() can be common across all
platforms/architectures, even in case of omap4, internally it
calls same set of functions as in __omap2_set_globals() function
(except for sdrc).
This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
so that we can reuse same function across omap2/3/4...
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 846d44547fd3..240f1969f2ad 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -6,7 +6,7 @@ | |||
6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ | 6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ |
7 | common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o | 7 | common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o |
8 | 8 | ||
9 | omap-2-3-common = irq.o sdrc.o | 9 | omap-2-3-common = irq.o |
10 | hwmod-common = omap_hwmod.o \ | 10 | hwmod-common = omap_hwmod.o \ |
11 | omap_hwmod_common_data.o | 11 | omap_hwmod_common_data.o |
12 | clock-common = clock.o clock_common_data.o \ | 12 | clock-common = clock.o clock_common_data.o \ |
@@ -23,6 +23,7 @@ obj-y += mcbsp.o | |||
23 | endif | 23 | endif |
24 | 24 | ||
25 | obj-$(CONFIG_TWL4030_CORE) += omap_twl.o | 25 | obj-$(CONFIG_TWL4030_CORE) += omap_twl.o |
26 | obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o | ||
26 | 27 | ||
27 | # SMP support ONLY available for OMAP4 | 28 | # SMP support ONLY available for OMAP4 |
28 | 29 | ||