diff options
author | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /Makefile | |
parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 25 | 3 | SUBLEVEL = 25 |
4 | EXTRAVERSION = -rc5 | 4 | EXTRAVERSION = -rc6 |
5 | NAME = Funky Weasel is Jiggy wit it | 5 | NAME = Funky Weasel is Jiggy wit it |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
@@ -189,7 +189,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ | |||
189 | # Alternatively CROSS_COMPILE can be set in the environment. | 189 | # Alternatively CROSS_COMPILE can be set in the environment. |
190 | # Default value for CROSS_COMPILE is not to prefix executables | 190 | # Default value for CROSS_COMPILE is not to prefix executables |
191 | # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile | 191 | # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile |
192 | 192 | export KBUILD_BUILDHOST := $(SUBARCH) | |
193 | ARCH ?= $(SUBARCH) | 193 | ARCH ?= $(SUBARCH) |
194 | CROSS_COMPILE ?= | 194 | CROSS_COMPILE ?= |
195 | 195 | ||