diff --git a/[refs] b/[refs]
index e965c03f77f9..d603bc109ca7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3a1938805d2e81b27d3d348788644f3bad004f2
+refs/heads/master: 313cc59eacc26cc7e8638660ec5a0ffb5e319045
diff --git a/trunk/drivers/video/carminefb.c b/trunk/drivers/video/carminefb.c
index e15bb447440a..c9b191319a9a 100644
--- a/trunk/drivers/video/carminefb.c
+++ b/trunk/drivers/video/carminefb.c
@@ -535,7 +535,7 @@ static struct fb_ops carminefb_ops = {
 	.fb_setcolreg	= carmine_setcolreg,
 };
 
-static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
+static int __devinit alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
 		int smem_offset, struct device *device, struct fb_info **rinfo)
 {
 	int ret;