diff -urN -x CVS linux-2.6.28-rc3/drivers/watchdog/Kconfig linux-2.6/drivers/watchdog/Kconfig
--- linux-2.6.28-rc3/drivers/watchdog/Kconfig	2008-11-05 22:21:01.000000000 +0200
+++ linux-2.6/drivers/watchdog/Kconfig	2008-11-05 22:23:07.000000000 +0200
@@ -67,11 +67,11 @@
 	  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"