X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Fconfig-2.6.25;h=d797a8c387b99f49fe127fa371964a757a2ec095;hb=dbc178fb28aeeeba9baad6b9aed41af8d22a99ea;hp=04f3c8b91c863f220fe5030b7af5bfc8153e3483;hpb=112eacc15558dd8aee917f33ff808351c57536c5;p=openwrt-10.03%2F.git

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 04f3c8b91..d797a8c38 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -898,6 +898,7 @@ CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
+# CONFIG_ENC28J60 is not set
 # CONFIG_NET_TULIP is not set
 CONFIG_NET_WIRELESS=y
 CONFIG_NET_WIRELESS_RTNETLINK=y
@@ -1149,6 +1150,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTL8187 is not set
@@ -1210,6 +1212,7 @@ CONFIG_SCSI_DMA=y
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LPFC is not set
 CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_NSP32 is not set
@@ -1542,6 +1545,7 @@ CONFIG_USB_ACM=m
 # CONFIG_USB_AIPTEK is not set
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_APPLETOUCH is not set
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1607,6 +1611,7 @@ CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_RNDIS_HOST=m
+# CONFIG_USB_NET_RNDIS_WLAN is not set
 CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 # CONFIG_USB_OHCI_HCD is not set
@@ -1780,7 +1785,16 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS is not set
-# CONFIG_W1 is not set
+CONFIG_W1=m
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
 # CONFIG_W83627HF_WDT is not set
 # CONFIG_W83697HF_WDT is not set
 # CONFIG_W83877F_WDT is not set