From patchwork Thu Jan  7 02:20:00 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Francisco Alecrim <alecrim@gmail.com>
X-Patchwork-Id: 71532
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o072Rs6f021106
	for <patchwork-omap@patchwork.kernel.org>;
	Thu, 7 Jan 2010 02:27:54 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756632Ab0AGC1k (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Wed, 6 Jan 2010 21:27:40 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756630Ab0AGC1k
	(ORCPT <rfc822; linux-omap-outgoing>);
	Wed, 6 Jan 2010 21:27:40 -0500
Received: from mail-yx0-f188.google.com ([209.85.210.188]:50373 "EHLO
	mail-yx0-f188.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756631Ab0AGC1i (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Wed, 6 Jan 2010 21:27:38 -0500
Received: by yxe26 with SMTP id 26so17289467yxe.4
	for <linux-omap@vger.kernel.org>;
	Wed, 06 Jan 2010 18:27:37 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:subject:date
	:message-id:x-mailer;
	bh=H32Xbo5TsI46XYaTspWZcOB0EeH6F0IgDr9LSnQ3vZw=;
	b=c+3VHGXT/JRpr5oFL7wy7vjpBQbGjTYztWjbMedwFbCpfhYwAvs//7kYH8l31A0qpS
	tiHGGYP8CQ1Jt8Y4YqNTC6ZHSRxG59OJ9F1UGe6eszoLnJ5rK1+T7Q/1izeE7YNFjtUH
	0FRUhT8ZPaUVQQC1d9Mf9HwV67Zrq7JGZUgtM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:subject:date:message-id:x-mailer;
	b=EpcsAL6AdHnRhQtIwIE7OL+bqXxFSnAcMiA6+aiBCY/NlLIIFiIZANt/8i6DgRh3On
	4eyHIQYa2H05ptrbs7j0INMilZWL9XPU1VgDUWverM0rsuC810zLlhOLmk17MCU29s/8
	sD8firPcOTEC2Lq2P7W/iaXtWos0fPYaDdEfc=
Received: by 10.101.141.11 with SMTP id t11mr31104656ann.18.1262830833379;
	Wed, 06 Jan 2010 18:20:33 -0800 (PST)
Received: from localhost.localdomain ([189.2.128.130])
	by mx.google.com with ESMTPS id 8sm8528590yxg.60.2010.01.06.18.20.31
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Wed, 06 Jan 2010 18:20:32 -0800 (PST)
From: Francisco Alecrim <alecrim@gmail.com>
To: linux-omap@vger.kernel.org
Cc: Francisco Alecrim <francisco.alecrim@openbossa.org>,
	Francisco Alecrim <alecrim@gmail.com>
Subject: [PATCH] n8x0_defconfig: active cbus, retu-wd and omap-wd
Date: Wed,  6 Jan 2010 22:20:00 -0400
Message-Id: <1262830800-30192-1-git-send-email-alecrim@gmail.com>
X-Mailer: git-send-email 1.6.3.3
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org


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