diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /target/mipsel | |
parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) |
resolve conflicts
Diffstat (limited to 'target/mipsel')
-rw-r--r-- | target/mipsel/kernel.config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target/mipsel/kernel.config b/target/mipsel/kernel.config index cbb30047f..3f5539b57 100644 --- a/target/mipsel/kernel.config +++ b/target/mipsel/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.36 -# Tue Dec 21 20:10:13 2010 +# Tue Jan 4 22:23:45 2011 # CONFIG_MIPS=y @@ -194,7 +194,8 @@ CONFIG_KERNEL_LZMA=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set |