diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-18 19:22:54 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-25 17:06:23 +0200 |
| commit | 778435045a416da71f1757a80e37200a5ea5af70 (patch) | |
| tree | b1e91a6458fa6c07567a764029d1d539a1e68db0 /drivers | |
| parent | baffab28b13120694fa3ebab08d3e99667a851d2 (diff) | |
| download | blackbird-obmc-linux-778435045a416da71f1757a80e37200a5ea5af70.tar.gz blackbird-obmc-linux-778435045a416da71f1757a80e37200a5ea5af70.zip | |
ARM: Kirkwood: Replace mrvl with marvell
It has been decided to use marvell, not mrvl, in the compatibility
property. Search & replace.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/orion_nand.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-mv.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index 9b8fd3d77168..fc5a868c436e 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c @@ -218,7 +218,7 @@ static int __devexit orion_nand_remove(struct platform_device *pdev) #ifdef CONFIG_OF static struct of_device_id orion_nand_of_match_table[] = { - { .compatible = "mrvl,orion-nand", }, + { .compatible = "marvell,orion-nand", }, {}, }; #endif diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c index b2185f4255aa..ebc1649d45d6 100644 --- a/drivers/rtc/rtc-mv.c +++ b/drivers/rtc/rtc-mv.c @@ -297,7 +297,7 @@ static int __exit mv_rtc_remove(struct platform_device *pdev) #ifdef CONFIG_OF static struct of_device_id rtc_mv_of_match_table[] = { - { .compatible = "mrvl,orion-rtc", }, + { .compatible = "marvell,orion-rtc", }, {} }; #endif |
