X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Fconfig-2.6.25;fp=target%2Flinux%2Fgeneric-2.6%2Fconfig-2.6.25;h=d277dd055ca4b677e44828959590e69e0b1865a8;hb=5ed0363af9f4edda4a63b02250c7822851e7e6f4;hp=df97842b5aeb4d6a5070bade0fb66e89057f09ec;hpb=7d2dbfd7711b9b089d01cd1a028874ad8bd6c56f;p=openwrt.git

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index df97842b5a..d277dd055c 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -1,4 +1,3 @@
-# CONFIG_CPU_FREQ is not set
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_9P_FS is not set
@@ -64,8 +63,10 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA is not set
 # CONFIG_ATALK is not set
+# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATARI_PARTITION is not set
+CONFIG_ATA_SFF=y
 # CONFIG_ATL1 is not set
 # CONFIG_ATM_AMBASSADOR is not set
 CONFIG_ATM_BR2684_IPFILTER=y
@@ -98,6 +99,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B44 is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set
@@ -272,6 +274,7 @@ CONFIG_CMDLINE=""
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_CONFIGFS_FS is not set
 # CONFIG_CONNECTOR is not set
+# CONFIG_CPU_FREQ is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -330,6 +333,7 @@ CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO=y
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DECNET is not set
@@ -898,6 +902,7 @@ CONFIG_MTD=y
 # CONFIG_MWAVE is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NAMESPACES is not set
+# CONFIG_NATSEMI is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NET_9P is not set
 # CONFIG_NET_ACT_GACT is not set
@@ -1126,6 +1131,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
+# CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set
 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
@@ -1195,9 +1201,9 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCF8575 is not set
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_HERMES is not set
-# CONFIG_PCI is not set
 # CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_MSI is not set
+CONFIG_PCI=y
 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_DEBUG is not set
@@ -1696,6 +1702,7 @@ CONFIG_TCP_CONG_WESTWOOD=y
 # CONFIG_TEXTSEARCH_KMP is not set
 CONFIG_TEXTSEARCH=y
 # CONFIG_THERMAL is not set
+CONFIG_TICK_ONESHOT=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
 CONFIG_TIMERFD=y