kernel: add some more missing kernel config symbols

SVN-Revision: 31458

3 files changed, 26 insertions, 3 deletions

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 1440ef493a..b8bfa899fd 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -45,7 +45,10 @@ $(eval $(call KernelPackage,fs-btrfs))
 define KernelPackage/fs-cifs
   SUBMENU:=$(FS_MENU)
   TITLE:=CIFS support
-  KCONFIG:=CONFIG_CIFS
+  KCONFIG:= \
+	CONFIG_CIFS \
+	CONFIG_CIFS_DFS_UPCALL=n \
+	CONFIG_CIFS_UPCALL=n
   FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko
   AUTOLOAD:=$(call AutoLoad,30,cifs)
   $(call AddDepends/nls)
@@ -226,7 +229,9 @@ define KernelPackage/fs-nfs
   TITLE:=NFS filesystem support
   DEPENDS:=+kmod-fs-nfs-common
   KCONFIG:= \
-	CONFIG_NFS_FS
+	CONFIG_NFS_FS \
+	CONFIG_NFS_USE_LEGACY_DNS=n \
+	CONFIG_NFS_USE_NEW_IDMAPPER=n
   FILES:= \
 	$(LINUX_DIR)/fs/nfs/nfs.ko
   AUTOLOAD:=$(call AutoLoad,40,nfs)
@@ -277,7 +282,9 @@ define KernelPackage/fs-nfsd
   SUBMENU:=$(FS_MENU)
   TITLE:=NFS kernel server support
   DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs
-  KCONFIG:=CONFIG_NFSD
+  KCONFIG:= \
+	CONFIG_NFSD \
+	CONFIG_NFSD_FAULT_INJECTION=n
   FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko
   AUTOLOAD:=$(call AutoLoad,40,nfsd)
 endef
diff --git a/target/linux/generic/config-3.2 b/target/linux/generic/config-3.2
index f1ca2d2be4..fe32ae3f2d 100644
--- a/target/linux/generic/config-3.2
+++ b/target/linux/generic/config-3.2
@@ -149,6 +149,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_ATM_TCP is not set
 # CONFIG_ATM_ZATM is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
 # CONFIG_AUDIT is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_AUTO_ZRELADDR is not set
@@ -497,6 +498,8 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CXT1E1 is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
@@ -596,6 +599,7 @@ CONFIG_DEVPORT=y
 # CONFIG_EASYCAP is not set
 # CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
 # CONFIG_EDAC is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_93XX46 is not set
@@ -614,6 +618,7 @@ CONFIG_EMBEDDED=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_ENIC is not set
 # CONFIG_EPIC100 is not set
 CONFIG_EPOLL=y
@@ -1253,6 +1258,7 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_KGDB is not set
 # CONFIG_KMEMCHECK is not set
 # CONFIG_KPROBES is not set
@@ -2504,6 +2510,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIO is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PARKBD is not set
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SFC is not set
 # CONFIG_SFI is not set
@@ -3076,6 +3083,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
 # CONFIG_USB_SERIAL_MOS7720 is not set
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_MOTOROLA is not set
diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index a1ec9edf26..e66304236d 100644
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -153,6 +153,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_ATM_TCP is not set
 # CONFIG_ATM_ZATM is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ATP is not set
 # CONFIG_AUDIT is not set
 # CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
 # CONFIG_AUTOFS4_FS is not set
@@ -506,6 +507,8 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CXT1E1 is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
@@ -607,6 +610,7 @@ CONFIG_DQL=y
 # CONFIG_EASYCAP is not set
 # CONFIG_ECHO is not set
 # CONFIG_ECONET is not set
+# CONFIG_ECRYPT_FS is not set
 # CONFIG_EDAC is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_93XX46 is not set
@@ -625,6 +629,7 @@ CONFIG_EMBEDDED=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_ENIC is not set
 # CONFIG_EPIC100 is not set
 CONFIG_EPOLL=y
@@ -1269,6 +1274,7 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_KGDB is not set
 # CONFIG_KMEMCHECK is not set
 # CONFIG_KPROBES is not set
@@ -2538,6 +2544,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIO is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PARKBD is not set
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SFC is not set
 # CONFIG_SFI is not set
@@ -3114,6 +3121,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
 # CONFIG_USB_SERIAL_MOS7720 is not set
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_MOTOROLA is not set