diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 18:26:51 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 18:26:51 +0200 |
commit | 2b52e67da00817f93884a344a9a8b7e2c585fc8c (patch) | |
tree | caa9c494197016efa62412c2483e36f011b2d392 /target/linux/config | |
parent | e8f74f7222ddc977bf775e31101980b9311b7200 (diff) | |
parent | 48b18373159b70caca3f41643804c549552d66f4 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
-rw-r--r-- | target/linux/config/Config.in.block | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.input | 10 | ||||
-rw-r--r-- | target/linux/config/Config.in.netfilter.core | 7 | ||||
-rw-r--r-- | target/linux/config/Config.in.netfilter.ip4 | 1 |
4 files changed, 13 insertions, 6 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index ce526441b..87fce5e8e 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -153,6 +153,7 @@ config ADK_KERNEL_ATA_PIIX config ADK_KERNEL_SATA_AHCI tristate select ADK_KERNEL_BLOCK + select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 4b476a8b2..27966d80b 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -10,7 +10,7 @@ config ADK_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 + default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n @@ -48,7 +48,7 @@ config ADK_KERNEL_INPUT_KEYBOARD default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 + default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n @@ -61,7 +61,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 + default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 default n config ADK_KERNEL_INPUT_MOUSE @@ -73,7 +73,7 @@ config ADK_KERNEL_INPUT_MOUSE default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 + default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n @@ -86,7 +86,7 @@ config ADK_KERNEL_INPUT_MOUSEDEV default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 + default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n diff --git a/target/linux/config/Config.in.netfilter.core b/target/linux/config/Config.in.netfilter.core index e2e9a2bbb..964b71c37 100644 --- a/target/linux/config/Config.in.netfilter.core +++ b/target/linux/config/Config.in.netfilter.core @@ -9,6 +9,13 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK Layer 3 independent connection tracking is experimental scheme which generalize ip_conntrack to support other layer 3 protocols. +config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_CHECKSUM + tristate '"CHECKSUM" target support' + select ADK_KERNEL_NETFILTER_XTABLES + select ADK_KPACKAGE_KMOD_IP_NF_MANGLE + select ADK_KERNEL_NETFILTER_ADVANCED + help + config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_CLASSIFY tristate '"CLASSIFY" target support' select ADK_KERNEL_NETFILTER_XTABLES diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index 95a71b917..1a1e91daf 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -120,4 +120,3 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ECN an IP packet. This is particularly useful, if you need to work around existing ECN blackholes on the internet, but don't want to disable ECN support in general. - |