diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /Makefile | |
parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -206,7 +206,11 @@ ifeq ($(ARCH),x86_64) | |||
206 | endif | 206 | endif |
207 | 207 | ||
208 | # Where to locate arch specific headers | 208 | # Where to locate arch specific headers |
209 | hdr-arch := $(SRCARCH) | 209 | ifeq ($(ARCH),sparc64) |
210 | hdr-arch := sparc | ||
211 | else | ||
212 | hdr-arch := $(SRCARCH) | ||
213 | endif | ||
210 | 214 | ||
211 | KCONFIG_CONFIG ?= .config | 215 | KCONFIG_CONFIG ?= .config |
212 | 216 | ||