From: Frederic Bompart Date: Mon, 20 Feb 2006 14:37:55 +0000 (+0000) Subject: merge of 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0 X-Git-Tag: Release-2010-05/1~9453^2~2306 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06be971c59fdd303157bd629fd79b511d5188fee;p=openembedded.git merge of 9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0 and fac9555337e7b9a6c77de5eea67fa836b2c4c0da --- 06be971c59fdd303157bd629fd79b511d5188fee diff --cc packages/linux/handhelds-pxa-2.6/h2200/defconfig index 1ab08bf81e,3a35128627..d1790dfe27 --- a/packages/linux/handhelds-pxa-2.6/h2200/defconfig +++ b/packages/linux/handhelds-pxa-2.6/h2200/defconfig @@@ -844,9 -978,21 +978,21 @@@ CONFIG_L3= # # Watchdog Cards # - # CONFIG_WATCHDOG is not set + CONFIG_WATCHDOG=y + # CONFIG_WATCHDOG_NOWAYOUT is not set + + # + # Watchdog Device Drivers + # + # CONFIG_SOFT_WATCHDOG is not set + CONFIG_SA1100_WATCHDOG=m + + # + # USB-based Watchdog Cards + # + # CONFIG_USBPCWATCHDOG is not set # CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=y +CONFIG_SA1100_RTC=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@@ -1280,10 -1444,11 +1444,11 @@@ CONFIG_RAMFS= # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y - # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set + CONFIG_JFFS2_SUMMARY=y + CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set