aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/thincan/config-default
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-16 10:44:49 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-16 10:44:49 +0000
commit8ace34552a49064d6f781dfe23a5fb4ff2b88c35 (patch)
tree6c1f01e3f74e696493d15b79e4396c32e03e750b /target/linux/x86/thincan/config-default
parent4cd69e320c6e4f7448191fa42c7c8fdc71b76046 (diff)
downloadupstream-8ace34552a49064d6f781dfe23a5fb4ff2b88c35.tar.gz
upstream-8ace34552a49064d6f781dfe23a5fb4ff2b88c35.tar.bz2
upstream-8ace34552a49064d6f781dfe23a5fb4ff2b88c35.zip
x86: sync 2.6.39 configs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31749 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/thincan/config-default')
-rw-r--r--target/linux/x86/thincan/config-default35
1 files changed, 12 insertions, 23 deletions
diff --git a/target/linux/x86/thincan/config-default b/target/linux/x86/thincan/config-default
index ce04ea29b9..405c65b5fc 100644
--- a/target/linux/x86/thincan/config-default
+++ b/target/linux/x86/thincan/config-default
@@ -1,26 +1,15 @@
-
-# Fix freeze-on-boot issue
-CONFIG_EMBEDDED=n
-
-# Enable in-kernel NFS client
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-
-# Enable NBD
-CONFIG_BLK_DEV_NBD=y
-
-# Enable Realtek 8139
CONFIG_8139TOO=y
-CONFIG_8139TOO_PIO=n
-CONFIG_8139TOO_TUNE_TWISTER=n
-CONFIG_8139TOO_8129=n
-CONFIG_8139_OLD_RX_RESET=n
-
-# Enable in-kernel IP autoconfiguration
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_BLK_DEV_NBD=y
+# CONFIG_EMBEDDED is not set
CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_BOOTP is not set
CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=n
-CONFIG_IP_PNP_RARP=n
-
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_LOCKD=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
+CONFIG_SUNRPC=y