diff --git a/[refs] b/[refs]
index d6744ae0ed71..0dbfb2ec92a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc4effc7a98d0d320e478d1d42bc4a8a64380150
+refs/heads/master: 756e21a022aba5214bafcf803f114aed8a783b99
diff --git a/trunk/drivers/video/matrox/matroxfb_maven.c b/trunk/drivers/video/matrox/matroxfb_maven.c
index 6019710dc298..531a0c3b6ec1 100644
--- a/trunk/drivers/video/matrox/matroxfb_maven.c
+++ b/trunk/drivers/video/matrox/matroxfb_maven.c
@@ -1297,20 +1297,13 @@ static struct i2c_driver maven_driver={
 	.detach_client	= maven_detach_client,
 };
 
-/* ************************** */
-
-static int matroxfb_maven_init(void) {
-	int err;
-
-	err = i2c_add_driver(&maven_driver);
-	if (err) {
-		printk(KERN_ERR "maven: Maven driver failed to register (%d).\n", err);
-		return err;
-	}
-	return 0;
+static int __init matroxfb_maven_init(void)
+{
+	return i2c_add_driver(&maven_driver);
 }
 
-static void matroxfb_maven_exit(void) {
+static void __exit matroxfb_maven_exit(void)
+{
 	i2c_del_driver(&maven_driver);
 }