clean up nfsd kernel config entries (#1523)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6731 3c298f89-4303-0410-b956-a3cf2f4a3e73

10 files changed, 2 insertions, 17 deletions

diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index 432a12e267..216f23ca83 100644
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -278,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
diff --git a/target/linux/at91-2.6/config/default b/target/linux/at91-2.6/config/default
index 3a8e839eef..4d3c444c1f 100644
--- a/target/linux/at91-2.6/config/default
+++ b/target/linux/at91-2.6/config/default
@@ -238,7 +238,6 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_NET_RADIO is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NEW_LEDS is not set
-# CONFIG_NFSD is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NVRAM is not set
diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default
index 0b752808ed..baeb14aab1 100644
--- a/target/linux/brcm47xx-2.6/config/default
+++ b/target/linux/brcm47xx-2.6/config/default
@@ -218,7 +218,6 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NFSD is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
diff --git a/target/linux/brcm63xx-2.6/config/default b/target/linux/brcm63xx-2.6/config/default
index 3c4016aec4..1d80fda4b3 100644
--- a/target/linux/brcm63xx-2.6/config/default
+++ b/target/linux/brcm63xx-2.6/config/default
@@ -334,8 +334,6 @@ CONFIG_NET_KEY=y
 CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
 # CONFIG_NET_SCH_CLK_JIFFIES is not set
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFS_FS is not set
 CONFIG_NLS=y
 CONFIG_NLS_ASCII=m
 # CONFIG_NLS_CODEPAGE_437 is not set
diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template
index b475702f06..385610868b 100644
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -665,9 +665,11 @@ CONFIG_NET_WIRELESS_RTNETLINK=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFSD=m
 CONFIG_NFSD_TCP=y
+# CONFIG_NFSD_V2_ACL is not set
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V4=y
+# CONFIG_NFS_ACL_SUPPORT is not set
 CONFIG_NFS_COMMON=y
 # CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFS_FS=m
diff --git a/target/linux/iop32x-2.6/config/default b/target/linux/iop32x-2.6/config/default
index 69001f4b65..e912fce946 100644
--- a/target/linux/iop32x-2.6/config/default
+++ b/target/linux/iop32x-2.6/config/default
@@ -269,8 +269,6 @@ CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NEW_LEDS is not set
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFS_V4 is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default
index 26bb407d75..eceddf9cf0 100644
--- a/target/linux/ixp4xx-2.6/config/default
+++ b/target/linux/ixp4xx-2.6/config/default
@@ -291,8 +291,6 @@ CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NEW_LEDS is not set
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFS_V4 is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
diff --git a/target/linux/pxa-2.6/config/default b/target/linux/pxa-2.6/config/default
index dcbff874af..6e87a2cf36 100644
--- a/target/linux/pxa-2.6/config/default
+++ b/target/linux/pxa-2.6/config/default
@@ -287,8 +287,6 @@ CONFIG_NET_DIVERT=y
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_WIRELESS_RTNETLINK is not set
 # CONFIG_NEW_LEDS is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFS_FS is not set
 # CONFIG_NLS is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NTFS_FS is not set
diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default
index adf7eec07b..f651ff7395 100644
--- a/target/linux/rdc-2.6/config/default
+++ b/target/linux/rdc-2.6/config/default
@@ -273,7 +273,6 @@ CONFIG_NETWORK_SECMARK=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_SCH_NETEM is not set
 CONFIG_NET_VENDOR_3COM=y
-# CONFIG_NFSD is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_NORTEL_HERMES is not set
 # CONFIG_NSC_GPIO is not set
diff --git a/target/linux/sibyte-2.6/config/default b/target/linux/sibyte-2.6/config/default
index f5e42f24c9..c9b9948559 100644
--- a/target/linux/sibyte-2.6/config/default
+++ b/target/linux/sibyte-2.6/config/default
@@ -239,7 +239,6 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_NET_SB1250_MAC=y
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NFSD is not set
 CONFIG_NR_CPUS=2
 # CONFIG_NTFS_FS is not set
 # CONFIG_N_HDLC is not set