diff --git a/[refs] b/[refs]
index f734e158e319..2ab04c45b2d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24b82d3c350dfc16cd4a7de87ca0959ff5fbaa15
+refs/heads/master: 2fe87aef33b77d66fada83f5dc57b6798ad5df07
diff --git a/trunk/drivers/mtd/nand/gpio.c b/trunk/drivers/mtd/nand/gpio.c
index ce6a284c8277..bc73bc5f2713 100644
--- a/trunk/drivers/mtd/nand/gpio.c
+++ b/trunk/drivers/mtd/nand/gpio.c
@@ -417,20 +417,7 @@ static struct platform_driver gpio_nand_driver = {
 	},
 };
 
-static int __init gpio_nand_init(void)
-{
-	printk(KERN_INFO "GPIO NAND driver, © 2004 Simtec Electronics\n");
-
-	return platform_driver_register(&gpio_nand_driver);
-}
-
-static void __exit gpio_nand_exit(void)
-{
-	platform_driver_unregister(&gpio_nand_driver);
-}
-
-module_init(gpio_nand_init);
-module_exit(gpio_nand_exit);
+module_platform_driver(gpio_nand_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");