config cleanups

SVN-Revision: 15861

7 files changed, 40 insertions, 18 deletions

diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21
index 9523d0b330..5fc632e497 100644
--- a/target/linux/generic-2.6/config-2.6.21
+++ b/target/linux/generic-2.6/config-2.6.21
@@ -671,7 +671,7 @@ CONFIG_JOLIET=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LBD is not set
diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23
index df91d9d269..5811eb1c2f 100644
--- a/target/linux/generic-2.6/config-2.6.23
+++ b/target/linux/generic-2.6/config-2.6.23
@@ -717,7 +717,7 @@ CONFIG_JOLIET=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LBD is not set
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 8c1fdcefd7..6b602b9d0f 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -750,7 +750,7 @@ CONFIG_JOLIET=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LBD is not set
@@ -781,6 +781,10 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_MAC80211_LEDS is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
 # CONFIG_MAC_PARTITION is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set
diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index b32a8c4aa3..0640002a2c 100644
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -817,7 +817,7 @@ CONFIG_JOLIET=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_LAPB is not set
diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index 2db1b908ce..d7c1d2dda6 100644
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -299,7 +299,6 @@ CONFIG_CMDLINE=""
 # CONFIG_CRAMFS is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
 # CONFIG_CRC7 is not set
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC_ITU_T is not set
@@ -307,8 +306,8 @@ CONFIG_CRC32=y
 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO_AEAD2=m
 CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_AES_586 is not set
+CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ALGAPI2=m
 CONFIG_CRYPTO_ALGAPI=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
@@ -323,6 +322,7 @@ CONFIG_CRYPTO_BLKCIPHER=m
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_CBC is not set
 # CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_CTR is not set
@@ -356,8 +356,8 @@ CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_RNG2=m
 CONFIG_CRYPTO_RNG=m
-# CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -458,6 +458,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
 CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -490,6 +491,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_HDLC_CISCO is not set
 # CONFIG_HDLC_FR is not set
 # CONFIG_HDLC is not set
@@ -596,6 +598,9 @@ CONFIG_HZ_100=y
 # CONFIG_I82092 is not set
 # CONFIG_I82365 is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -869,7 +874,7 @@ CONFIG_JOLIET=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_LAPB is not set
@@ -1210,6 +1215,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CT_PROTO_GRE is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_NF_NAT_AMANDA is not set
 # CONFIG_NF_NAT_FTP is not set
 # CONFIG_NF_NAT_H323 is not set
@@ -1381,6 +1387,7 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PID_NS is not set
 CONFIG_PLIST=y
 # CONFIG_PLX_HERMES is not set
@@ -1844,6 +1851,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_TLE62X0 is not set
diff --git a/target/linux/generic-2.6/config-2.6.29 b/target/linux/generic-2.6/config-2.6.29
index 691440206d..2d7014a02d 100644
--- a/target/linux/generic-2.6/config-2.6.29
+++ b/target/linux/generic-2.6/config-2.6.29
@@ -299,10 +299,6 @@ CONFIG_CMDLINE=""
 # CONFIG_CODA_FS is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CONFIGFS_FS is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
@@ -319,6 +315,7 @@ CONFIG_CRC32=y
 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO_AEAD2=m
 CONFIG_CRYPTO_AEAD=m
+# CONFIG_CRYPTO_AES_586 is not set
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ALGAPI2=m
 CONFIG_CRYPTO_ALGAPI=m
@@ -334,6 +331,7 @@ CONFIG_CRYPTO_BLKCIPHER=m
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_CBC is not set
 # CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_CTR is not set
@@ -367,6 +365,7 @@ CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_RNG2=m
 CONFIG_CRYPTO_RNG=m
+# CONFIG_CRYPTO_SALSA20_586 is not set
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -377,6 +376,7 @@ CONFIG_CRYPTO_RNG=m
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_TWOFISH_COMMON is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_WP512 is not set
@@ -472,6 +472,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
 CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -505,6 +506,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_HDLC_CISCO is not set
 # CONFIG_HDLC_FR is not set
 # CONFIG_HDLC is not set
@@ -889,7 +891,7 @@ CONFIG_JOLIET=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_LAPB is not set
@@ -1236,6 +1238,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CT_PROTO_GRE is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_NF_NAT_AMANDA is not set
 # CONFIG_NF_NAT_FTP is not set
 # CONFIG_NF_NAT_H323 is not set
@@ -1407,6 +1410,7 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PID_NS is not set
 CONFIG_PLIST=y
 # CONFIG_PLX_HERMES is not set
@@ -1878,6 +1882,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_TLE62X0 is not set
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 3e1a65cb1a..201cd9f1e6 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -304,10 +304,6 @@ CONFIG_CMDLINE=""
 # CONFIG_CODA_FS is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CONFIGFS_FS is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
@@ -324,6 +320,7 @@ CONFIG_CRC32=y
 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO_AEAD2=m
 # CONFIG_CRYPTO_AEAD is not set
+# CONFIG_CRYPTO_AES_586 is not set
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ALGAPI2=m
 CONFIG_CRYPTO_ALGAPI=m
@@ -339,6 +336,7 @@ CONFIG_CRYPTO_BLKCIPHER=m
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_CBC is not set
 # CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_CTR is not set
@@ -373,6 +371,7 @@ CONFIG_CRYPTO_PCOMP=m
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_RNG2=m
 # CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -383,6 +382,7 @@ CONFIG_CRYPTO_RNG2=m
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_TWOFISH_COMMON is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 CONFIG_CRYPTO_WORKQUEUE=m
@@ -487,6 +487,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
 CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
 # CONFIG_FSCACHE is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FTL is not set
@@ -522,6 +523,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_HDLC_CISCO is not set
 # CONFIG_HDLC_FR is not set
 # CONFIG_HDLC is not set
@@ -914,7 +916,7 @@ CONFIG_JOLIET=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
 # CONFIG_KMEMTRACE is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_LAPB is not set
@@ -1276,6 +1278,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CT_PROTO_GRE is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_NF_NAT_AMANDA is not set
 # CONFIG_NF_NAT_FTP is not set
 # CONFIG_NF_NAT_H323 is not set
@@ -1450,6 +1453,7 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PID_NS is not set
 CONFIG_PLIST=y
 # CONFIG_PLX_HERMES is not set
@@ -1931,6 +1935,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_TLE62X0 is not set