X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fadm5120-2.6%2Fconfig%2Fdefault;h=216f23ca8333566ad33cc541e9168647b374fefb;hb=ded9d6a0d4322a706e148b8c5d0eaa794885445f;hp=bbf6d8b6a2f8bbc6d1fb40f40de183783d79aaf8;hpb=10c53e0e7396f37ca00539e1535b633ddb3d2dce;p=openwrt-10.03%2F.git

diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index bbf6d8b6a..216f23ca8 100644
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -33,10 +33,6 @@ CONFIG_BRIDGE_EBT_ULOG=y
 CONFIG_BRIDGE_EBT_VLAN=y
 CONFIG_BRIDGE_NF_EBTABLES=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIUSB is not set
 CONFIG_CIFS_DEBUG2=y
 CONFIG_CIFS_EXPERIMENTAL=y
 CONFIG_CIFS_STATS2=y
@@ -282,11 +278,6 @@ CONFIG_NET_SCH_HTB=y
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_TEQL is not set
 # CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_DIRECTIO=y
-CONFIG_NFS_V3_ACL=y
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
@@ -300,6 +291,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 +315,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 +336,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
@@ -365,24 +355,10 @@ CONFIG_TRAD_SIGNALS=y
 # CONFIG_TUN is not set
 # CONFIG_UDF_FS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_USB=y
-# CONFIG_USB_ACM is not set
-CONFIG_USB_ADM5120_HCD=y
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_EHCI_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB is not set
 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