diff mbox

n8x0_defconfig: active cbus, retu-wd and omap-wd

Message ID 1262830800-30192-1-git-send-email-alecrim@gmail.com (mailing list archive)
State Accepted
Commit 11e11147915637c01577f3a3efb6f430660a04b4
Headers show

Commit Message

Francisco Alecrim Jan. 7, 2010, 2:20 a.m. UTC
None
diff mbox

Patch

diff --git a/arch/arm/configs/n8x0_defconfig b/arch/arm/configs/n8x0_defconfig
index e6f667c..66b1d3f 100644
--- a/arch/arm/configs/n8x0_defconfig
+++ b/arch/arm/configs/n8x0_defconfig
@@ -661,7 +661,19 @@  CONFIG_GPIOLIB=y
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_THERMAL_HWMON is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_OMAP_WATCHDOG=y
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -851,6 +863,18 @@  CONFIG_RTC_LIB=y
 # CONFIG_STAGING is not set
 
 #
+# CBUS support
+#
+CONFIG_CBUS=y
+# CONFIG_CBUS_TAHVO is not set
+CONFIG_CBUS_RETU=y
+# CONFIG_CBUS_RETU_USER is not set
+# CONFIG_CBUS_RETU_POWERBUTTON is not set
+# CONFIG_CBUS_RETU_RTC is not set
+CONFIG_CBUS_RETU_WDT=y
+# CONFIG_CBUS_RETU_HEADSET is not set
+
+#
 # File systems
 #
 # CONFIG_EXT2_FS is not set