From fb63daa4ad62af9f60b7c59a36a477d13179e5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 2 Sep 2010 10:03:38 +0200 Subject: [PATCH] --- yaml --- r: 217309 b: refs/heads/master c: 375c324b7eff9218e14a63fdbfa36182f57ad37d h: refs/heads/master i: 217307: 86de3220d2704621a71dd2ec061611172a971580 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/fb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1df8235f9e6d..c8e58ae656bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87ba8288670c53f66ce41d8ce292c64674de821e +refs/heads/master: 375c324b7eff9218e14a63fdbfa36182f57ad37d diff --git a/trunk/arch/arm/plat-omap/fb.c b/trunk/arch/arm/plat-omap/fb.c index 0054b9501a53..a727133683ea 100644 --- a/trunk/arch/arm/plat-omap/fb.c +++ b/trunk/arch/arm/plat-omap/fb.c @@ -336,7 +336,7 @@ void omapfb_set_ctrl_platform_data(void *data) omapfb_config.ctrl_platform_data = data; } -static inline int omap_init_fb(void) +static int __init omap_init_fb(void) { const struct omap_lcd_config *conf; @@ -381,7 +381,7 @@ void omapfb_set_platform_data(struct omapfb_platform_data *data) omapfb_config = *data; } -static inline int omap_init_fb(void) +static int __init omap_init_fb(void) { return platform_device_register(&omap_fb_device); }