diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
| commit | 256a81b3b12fceef1676d6114d9ff0568b645bca (patch) | |
| tree | 80776c7bb719a3f29a64305ff6ff5f9c2445a186 /target/linux | |
| parent | 8441e81773371fa37c9d7774436f357e97f4db99 (diff) | |
| parent | d7af52ccd4cab1fcffaec5706a8a6eba96502b89 (diff) | |
merge conflict
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/kernel.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 97237b382..26205a842 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -2,6 +2,7 @@ CONFIG_DEFAULT_HOSTNAME="openadk" CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="" CONFIG_MMU=y +CONFIG_NO_HZ=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y @@ -26,9 +27,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y -CONFIG_NO_HZ=y CONFIG_PRINTK=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_BUG=n CONFIG_FUTEX=y CONFIG_EPOLL=y |