From: Florian Fainelli Date: Mon, 19 Mar 2007 21:52:40 +0000 (+0000) Subject: Remove 8250 serial driver, enable software watchdog X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b8ca430c7fdc5f0b8a116acd08038b7308904b03;p=librecmc%2Flibrecmc.git Remove 8250 serial driver, enable software watchdog SVN-Revision: 6618 --- diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default index bbf6d8b6a2..81117c4234 100644 --- a/target/linux/adm5120-2.6/config/default +++ b/target/linux/adm5120-2.6/config/default @@ -199,7 +199,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MSDOS_FS is not set CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set -CONFIG_MTD_ADM5120=y +# CONFIG_MTD_ADM5120 is not set # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK2MTD is not set # CONFIG_MTD_BLOCK_RO is not set @@ -300,6 +300,7 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PARTITION_ADVANCED is not set # CONFIG_PCCARD is not set +# CONFIG_PCIPCWATCHDOG is not set CONFIG_PCI_ADM5120=y # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set @@ -323,10 +324,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y # CONFIG_SENSORS_ABITUGURU is not set # CONFIG_SENSORS_F71805F is not set # CONFIG_SENSORS_VT1211 is not set -# CONFIG_SERIAL_8250_EXTENDED is not set -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_ADM5120=y CONFIG_SERIO=y # CONFIG_SERIO_I8042 is not set @@ -347,6 +345,7 @@ CONFIG_SERIO_SERPORT=y # CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_SWARM is not set CONFIG_SLHC=y +CONFIG_SOFT_WATCHDOG=m # CONFIG_SOUND is not set # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SYN_COOKIES=y @@ -366,6 +365,7 @@ CONFIG_TRAD_SIGNALS=y # CONFIG_UDF_FS is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_USB=y +# CONFIG_USBPCWATCHDOG is not set # CONFIG_USB_ACM is not set CONFIG_USB_ADM5120_HCD=y # CONFIG_USB_CATC is not set @@ -382,7 +382,6 @@ CONFIG_USB_ADM5120_HCD=y CONFIG_UTS_NS=y # CONFIG_VFAT_FS is not set CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_WATCHDOG is not set CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_USER=y # CONFIG_XFS_FS is not set