diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-17 09:04:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-17 09:04:33 +0200 |
| commit | efd624e7924ee0456ea18a1958f38cc9ea52a963 (patch) | |
| tree | 3bf29be26dd5a54f300fe94a769b93cda3683c8b /target/linux | |
| parent | 1a10d0e3ef4d137a9093d27c99fec286a083c521 (diff) | |
| parent | 7a464646964980beb100d22836ad36c02c695744 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.debug | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.network | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 50c173321..cea0198d1 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -90,7 +90,8 @@ config ADK_KPACKAGE_KMOD_OPROFILE prompt "kernel support for oprofile" tristate select ADK_KERNEL_PROFILING - depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX + depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_M68K default n help use oprofile package to make use of the kernel support. diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index c0fae6e1e..00d05dcd4 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -4,6 +4,10 @@ config ADK_KERNEL_INET boolean default y +config ADK_KERNEL_NET_CORE + boolean + default y + config ADK_KERNEL_IP_FIB_HASH boolean default y |