From 03b3067ac5e81c8b82fe5054008ffa4aebe472c8 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 24 Jan 2013 17:39:55 +0100
Subject: [PATCH] --- yaml --- r: 360368 b: refs/heads/master c:
 2d13dc3bce8bff81668f793802de38ca12b775b8 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/mtd/devices/bcm47xxsflash.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 026a32c79ba2..384dfcf10442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60aca067b5308705a34dbb6548b459487f92da90
+refs/heads/master: 2d13dc3bce8bff81668f793802de38ca12b775b8
diff --git a/trunk/drivers/mtd/devices/bcm47xxsflash.c b/trunk/drivers/mtd/devices/bcm47xxsflash.c
index 61a45cbde377..729ca5fb53ed 100644
--- a/trunk/drivers/mtd/devices/bcm47xxsflash.c
+++ b/trunk/drivers/mtd/devices/bcm47xxsflash.c
@@ -89,6 +89,7 @@ static int bcm47xxsflash_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver bcma_sflash_driver = {
+	.probe	= bcm47xxsflash_probe,
 	.remove = bcm47xxsflash_remove,
 	.driver = {
 		.name = "bcma_sflash",
@@ -100,7 +101,7 @@ static int __init bcm47xxsflash_init(void)
 {
 	int err;
 
-	err = platform_driver_probe(&bcma_sflash_driver, bcm47xxsflash_probe);
+	err = platform_driver_register(&bcma_sflash_driver);
 	if (err)
 		pr_err("Failed to register BCMA serial flash driver: %d\n",
 		       err);