The patch titled SAM9 watchdog: supported on all SAM9 and CAP9 processors has been added to the -mm tree. Its filename is sam9-watchdog-supported-on-all-sam9-and-cap9-processors.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: SAM9 watchdog: supported on all SAM9 and CAP9 processors From: "Andrew Victor" <avictor.za@xxxxxxxxx> The SAM9 watchdog driver is usable on the whole family of AT91SAM9 and CAP9 processors. Update the configuration to indicate this and allow the driver to be selected. Signed-off-by: Andrew Victor <linux@xxxxxxxxxxxx> Cc: Wim Van Sebroeck <wim@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/watchdog/Kconfig~sam9-watchdog-supported-on-all-sam9-and-cap9-processors drivers/watchdog/Kconfig --- a/drivers/watchdog/Kconfig~sam9-watchdog-supported-on-all-sam9-and-cap9-processors +++ a/drivers/watchdog/Kconfig @@ -74,11 +74,11 @@ config AT91RM9200_WATCHDOG system when the timeout is reached. config AT91SAM9X_WATCHDOG - tristate "AT91SAM9X watchdog" - depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261) + tristate "AT91SAM9X / AT91CAP9 watchdog" + depends on ARCH_AT91 && !ARCH_AT91RM9200 help - Watchdog timer embedded into AT91SAM9X chips. This will reboot your - system when the timeout is reached. + Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will + reboot your system when the timeout is reached. config 21285_WATCHDOG tristate "DC21285 watchdog" _ Patches currently in -mm which might be from avictor.za@xxxxxxxxx are sam9-watchdog-update-for-moved-headers.patch sam9-watchdog-supported-on-all-sam9-and-cap9-processors.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html