diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /arch/m68k/Makefile | |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/Makefile')
| -rw-r--r-- | arch/m68k/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index b15173f28a23..8133dbc44964 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | # Copyright (C) 1994 by Hamish Macdonald | 13 | # Copyright (C) 1994 by Hamish Macdonald |
| 14 | # | 14 | # |
| 15 | 15 | ||
| 16 | KBUILD_DEFCONFIG := amiga_defconfig | 16 | KBUILD_DEFCONFIG := multi_defconfig |
| 17 | 17 | ||
| 18 | # override top level makefile | 18 | # override top level makefile |
| 19 | AS += -m68020 | 19 | AS += -m68020 |