diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
| commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /Makefile | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 26 | 3 | SUBLEVEL = 27 |
| 4 | EXTRAVERSION = | 4 | EXTRAVERSION = -rc1 |
| 5 | NAME = Rotary Wombat | 5 | NAME = Rotary Wombat |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -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 | ||