1 --- a/drivers/mtd/devices/bcm47xxsflash.c
2 +++ b/drivers/mtd/devices/bcm47xxsflash.c
3 @@ -44,7 +44,11 @@ static void bcm47xxsflash_fill_mtd(struc
4 mtd->writebufsize = mtd->writesize = 1;
7 -static int bcm47xxsflash_probe(struct platform_device *pdev)
8 +/**************************************************
10 + **************************************************/
12 +static int bcm47xxsflash_bcma_probe(struct platform_device *pdev)
14 struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);
15 struct bcm47xxsflash *b47s;
16 @@ -77,7 +81,7 @@ out:
20 -static int bcm47xxsflash_remove(struct platform_device *pdev)
21 +static int bcm47xxsflash_bcma_remove(struct platform_device *pdev)
23 struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev);
24 struct bcm47xxsflash *b47s = sflash->priv;
25 @@ -89,14 +93,18 @@ static int bcm47xxsflash_remove(struct p
28 static struct platform_driver bcma_sflash_driver = {
29 - .probe = bcm47xxsflash_probe,
30 - .remove = bcm47xxsflash_remove,
31 + .probe = bcm47xxsflash_bcma_probe,
32 + .remove = bcm47xxsflash_bcma_remove,
34 .name = "bcma_sflash",
39 +/**************************************************
41 + **************************************************/
43 static int __init bcm47xxsflash_init(void)