diff --git a/[refs] b/[refs]
index 5dabd610137d..21dda3e92a6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f56f6d30c75984d0aba2656eaeb35f3806395191
+refs/heads/master: 511e7483abe1ab433d8ab7a7998f799042b52941
diff --git a/trunk/drivers/video/macfb.c b/trunk/drivers/video/macfb.c
index aa8c714d6245..b790ddff76f9 100644
--- a/trunk/drivers/video/macfb.c
+++ b/trunk/drivers/video/macfb.c
@@ -596,7 +596,7 @@ static struct fb_ops macfb_ops = {
 	.fb_imageblit	= cfb_imageblit,
 };
 
-void __init macfb_setup(char *options)
+static void __init macfb_setup(char *options)
 {
 	char *this_opt;