diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
| commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 (patch) | |
| tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 /arch/cris/Makefile | |
| parent | c7e78cff6b7518212247fb20b1dc6411540dc9af (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
Diffstat (limited to 'arch/cris/Makefile')
| -rw-r--r-- | arch/cris/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/Makefile b/arch/cris/Makefile index 838cd2ae03ae..c6f5f5a2ffdf 100644 --- a/arch/cris/Makefile +++ b/arch/cris/Makefile | |||
| @@ -10,6 +10,8 @@ | |||
| 10 | # License. See the file "COPYING" in the main directory of this archive | 10 | # License. See the file "COPYING" in the main directory of this archive |
| 11 | # for more details. | 11 | # for more details. |
| 12 | 12 | ||
| 13 | KBUILD_DEFCONFIG := etrax-100lx_v2_defconfig | ||
| 14 | |||
| 13 | arch-y := v10 | 15 | arch-y := v10 |
| 14 | arch-$(CONFIG_ETRAX_ARCH_V10) := v10 | 16 | arch-$(CONFIG_ETRAX_ARCH_V10) := v10 |
| 15 | arch-$(CONFIG_ETRAX_ARCH_V32) := v32 | 17 | arch-$(CONFIG_ETRAX_ARCH_V32) := v32 |