diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /extra/Configs/Config.cris | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'extra/Configs/Config.cris')
| -rw-r--r-- | extra/Configs/Config.cris | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/extra/Configs/Config.cris b/extra/Configs/Config.cris index b3811d1e9..52ca0c36b 100644 --- a/extra/Configs/Config.cris +++ b/extra/Configs/Config.cris @@ -12,9 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH default y select ARCH_LITTLE_ENDIAN -config ARCH_CFLAGS - string - choice prompt "Target Architecture Type" default CONFIG_CRIS |