summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-04 18:10:24 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-04 18:10:24 +0100
commitb047da059a1042a27ba68b1bdc50dd187bd362f4 (patch)
tree5529bdac03674fab07bb4335fc5ce4e5654c7497 /target/linux/config
parent5d93cc6de511d5330d0d0c7a0ebae8e6c9638e3d (diff)
update kernel to 2.6.32
- update some applications asterisk, curl, strace, radvd, rpm - fix allconfig - /dev for full build seems to need more than 64k
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.block4
-rw-r--r--target/linux/config/Config.in.netdevice11
-rw-r--r--target/linux/config/Config.in.netfilter7
3 files changed, 13 insertions, 9 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index cd4781b15..cedaa941b 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -65,7 +65,7 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
tristate
select ADK_KERNEL_BLOCK
select ADK_KERNEL_ATA
- select ADK_KPACKAGE_KMOD_BLK_DEV_SD
+ select ADK_KERNEL_BLK_DEV_SD
depends on !ADK_KERNEL_SATA_AHCI
default n
help
@@ -188,7 +188,7 @@ config ADK_KPACKAGE_KMOD_SCSI
config ADK_KPACKAGE_KMOD_BLK_DEV_SD
prompt "kmod-scsi-disk.................... SCSI disk support"
- depends on !ADK_KERNEL_SCSI
+ depends on !ADK_KERNEL_BLK_DEV_SD
depends on ADK_KPACKAGE_KMOD_SCSI
tristate
help
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index a894c2114..2ab36a10f 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -109,9 +109,18 @@ config ADK_MOD_KERNEL_CFG80211
tristate
default n
+config ADK_MOD_KERNEL_LIB80211
+ tristate
+ default n
+
+config ADK_KERNEL_ATH_COMMON
+ tristate
+ default n
+
config ADK_MOD_KERNEL_MAC80211
tristate
select ADK_MOD_KERNEL_CFG80211
+ select ADK_MOD_KERNEL_LIB80211
select ADK_KPACKAGE_KMOD_CRYPTO_AES
select ADK_KPACKAGE_KMOD_CRYPTO_ECB
select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
@@ -128,6 +137,7 @@ config ADK_KPACKAGE_KMOD_MAC80211
prompt "kmod-mac80211................... mac80211 softmac"
tristate
select ADK_MOD_KERNEL_CFG80211
+ select ADK_MOD_KERNEL_LIB80211
select ADK_KPACKAGE_KMOD_CRYPTO_AES
select ADK_KPACKAGE_KMOD_CRYPTO_ECB
select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
@@ -141,6 +151,7 @@ config ADK_KPACKAGE_KMOD_ATH5K
prompt "kmod-mac80211-ath5k............ Atheros 5xxx wireless cards"
tristate
select ADK_KERNEL_MAC80211_LEDS
+ select ADK_KERNEL_ATH_COMMON
depends on ADK_KPACKAGE_KMOD_MAC80211
default n
help
diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter
index fc3c2682f..ef2e1285a 100644
--- a/target/linux/config/Config.in.netfilter
+++ b/target/linux/config/Config.in.netfilter
@@ -417,13 +417,6 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
address part intact. It is similar to Fast NAT, except that
Netfilter's connection tracking doesn't work well with Fast NAT.
-config ADK_KPACKAGE_KMOD_IP_NF_TARGET_SAME
- tristate 'SAME target support'
- depends on ADK_KPACKAGE_KMOD_NF_NAT
- help
- This option adds a `SAME' target, which works like the standard SNAT
- target, but attempts to give clients the same IP for all connections.
-
config ADK_KPACKAGE_KMOD_IP_NF_MANGLE
tristate 'Packet mangling'
depends on ADK_KPACKAGE_KMOD_NF_NAT