summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-25 21:37:09 +0200
committerArnd Bergmann <arnd@arndb.de>2012-07-25 21:37:09 +0200
commitc1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7 (patch)
treefd013d6f38b25fd1c3890a7f4ad9aa25311e7f54 /drivers/rtc
parent49121304a9831449a841ca0c77dc0ad8697e23c9 (diff)
parent778435045a416da71f1757a80e37200a5ea5af70 (diff)
downloadop-kernel-dev-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.zip
op-kernel-dev-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.tar.gz
Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes
From Andrew Lunn <andrew@lunn.ch>: * 'v3.5-rc7-fixes' of git://github.com/lunn/linux: ARM: Kirkwood: Replace mrvl with marvell ARM: Orion: fix driver probe error handling with respect to clk ARM: Dove: Fixup ge00 initialisation ARM: Kirkwood: Fix PHY disable clk problems ARM: Kirkwood: Ensure runit clock always ticks. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-mv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c
index b2185f4..ebc1649 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
OpenPOWER on IntegriCloud