summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/test
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-11-21 07:34:32 +0100
committerNélio Laranjeiro2012-12-12 13:04:11 +0100
commit6c1e90844f96797be4462ff832a0e8d31342232e (patch)
treeb5cfe0bf5e51e5de1664370aca676feef246ca0e /cesar/ce/rx/test
parenta90e6b8378341fa7582ed3e7466713f1bd4b13eb (diff)
parente4e8dc666d13217ffbd663c7271dd3ca20008ca3 (diff)
Merge branch 'master-t3344-sar-configs' into eoc-drv-t3344-sar-configs
Conflicts: cesar/mac/sar/Config cesar/mac/sar/src/brg.c cesar/mac/sar/src/expiration.c cesar/mac/sar/src/mf_header.c cesar/mac/sar/src/rx.c
Diffstat (limited to 'cesar/ce/rx/test')
-rw-r--r--cesar/ce/rx/test/Config1
1 files changed, 0 insertions, 1 deletions
diff --git a/cesar/ce/rx/test/Config b/cesar/ce/rx/test/Config
index af835e2748..2d62cd39d5 100644
--- a/cesar/ce/rx/test/Config
+++ b/cesar/ce/rx/test/Config
@@ -1,4 +1,3 @@
CONFIG_DEBUG_FATAL_CATCH = y
CONFIG_SLAB_ALLOC_SCRAMBLE = y
-CONFIG_MAC_SAR_EOC_PERMANENT_MFS = y
CONFIG_CP_AV = y