diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
| commit | b99053eefce89c5c8500517f5f065c85b57d98ee (patch) | |
| tree | 2e99059d55e32db39a2ada348c39f71bb473c0c1 /Makefile | |
| parent | 761e0ee0f0beecee7c2528588b043609b880de58 (diff) | |
| parent | f8d56f1771e4867acc461146764b4feeb5245669 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 27 -EXTRAVERSION = -NAME = Rotary Wombat +SUBLEVEL = 28 +EXTRAVERSION = -rc2 +NAME = Killer Bat of Doom # *DOCUMENTATION* # To see a list of typical targets execute "make help" @@ -437,7 +437,7 @@ ifeq ($(config-targets),1) # KBUILD_DEFCONFIG may point out an alternative default configuration # used for 'make defconfig' include $(srctree)/arch/$(SRCARCH)/Makefile -export KBUILD_DEFCONFIG +export KBUILD_DEFCONFIG KBUILD_KCONFIG config %config: scripts_basic outputmakefile FORCE $(Q)mkdir -p include/linux include/config |