Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

This commit is contained in:
Russell King
2009-12-01 18:22:54 +00:00
39 changed files with 4356 additions and 110 deletions

View File

@@ -780,7 +780,7 @@ config RTC_DRV_TX4939
config RTC_DRV_MV
tristate "Marvell SoC RTC"
depends on ARCH_KIRKWOOD
depends on ARCH_KIRKWOOD || ARCH_DOVE
help
If you say yes here you will get support for the in-chip RTC
that can be found in some of Marvell's SoC devices, such as