From 11e2e8368c39313593fe4bf93bd408a0dbb98356 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 7 Feb 2012 10:41:34 +0000
Subject: [PATCH] --- yaml --- r: 287583 b: refs/heads/master c:
 e3958fe05d78643ec6c0e651747b59361553a840 h: refs/heads/master i:   287581:
 004967535e8eedbdb4833e49db9300e5e1496f88   287579:
 2f550cc1cf85707e084c7cfadbe0b11b9398c848   287575:
 96c730582b6bda09aa945b32c21b742f90f427c8   287567:
 8832e8688c7b09b7fd28a8ce4ff5025c6abe0b65   287551:
 86b2744d8a33f1f676642cc177ade8ccc2151f75 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-omap2/board-4430sdp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b7eba93adf9b..ffce9e2c2859 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45176f4cf7aa84da97c2c1e66569cb2e44cb97ce
+refs/heads/master: e3958fe05d78643ec6c0e651747b59361553a840
diff --git a/trunk/arch/arm/mach-omap2/board-4430sdp.c b/trunk/arch/arm/mach-omap2/board-4430sdp.c
index f2682e39ff58..50d2412ff395 100644
--- a/trunk/arch/arm/mach-omap2/board-4430sdp.c
+++ b/trunk/arch/arm/mach-omap2/board-4430sdp.c
@@ -814,7 +814,7 @@ static struct omap_dss_board_info sdp4430_dss_data = {
 	.default_device	= &sdp4430_lcd_device,
 };
 
-static void omap_4430sdp_display_init(void)
+static void __init omap_4430sdp_display_init(void)
 {
 	int r;