diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-03-05 15:37:04 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-03-05 15:37:04 -0800 |
| commit | 015f1e4297ad32f83251f3f4cee2389ce5516e9e (patch) | |
| tree | 1b16e317005dc3d09b0551a4db9182f7f4119f71 /arch/arm/mach-omap2/display.c | |
| parent | 1b35af54ee9cbbdd13fed53fd4acb0952ba522e1 (diff) | |
| parent | 9cf793f9b8b1ba9414e2a7591b2e911885f85a27 (diff) | |
| download | blackbird-op-linux-015f1e4297ad32f83251f3f4cee2389ce5516e9e.tar.gz blackbird-op-linux-015f1e4297ad32f83251f3f4cee2389ce5516e9e.zip | |
Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 28d16a4bb615..9706c648bc19 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -125,7 +125,7 @@ static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags) } } -static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) +static int __init omap4_dsi_mux_pads(int dsi_id, unsigned lanes) { u32 enable_mask, enable_shift; u32 pipd_mask, pipd_shift; @@ -158,7 +158,7 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) return 0; } -int omap_hdmi_init(enum omap_hdmi_flags flags) +int __init omap_hdmi_init(enum omap_hdmi_flags flags) { if (cpu_is_omap44xx()) omap4_hdmi_mux_pads(flags); @@ -166,7 +166,7 @@ int omap_hdmi_init(enum omap_hdmi_flags flags) return 0; } -static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask) +static int __init omap_dsi_enable_pads(int dsi_id, unsigned lane_mask) { if (cpu_is_omap44xx()) return omap4_dsi_mux_pads(dsi_id, lane_mask); @@ -174,7 +174,7 @@ static int omap_dsi_enable_pads(int dsi_id, unsigned lane_mask) return 0; } -static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask) +static void __init omap_dsi_disable_pads(int dsi_id, unsigned lane_mask) { if (cpu_is_omap44xx()) omap4_dsi_mux_pads(dsi_id, 0); |
