diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
tree | 29932718192962671c48c3fd1ea017a6112459e8 /Makefile | |
parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 26 | 3 | SUBLEVEL = 26 |
4 | EXTRAVERSION = -rc2 | 4 | EXTRAVERSION = -rc4 |
5 | NAME = Funky Weasel is Jiggy wit it | 5 | NAME = Funky Weasel is Jiggy wit it |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
@@ -1114,6 +1114,7 @@ MRPROPER_DIRS += include/config include2 usr/include | |||
1114 | MRPROPER_FILES += .config .config.old include/asm .version .old_version \ | 1114 | MRPROPER_FILES += .config .config.old include/asm .version .old_version \ |
1115 | include/linux/autoconf.h include/linux/version.h \ | 1115 | include/linux/autoconf.h include/linux/version.h \ |
1116 | include/linux/utsrelease.h \ | 1116 | include/linux/utsrelease.h \ |
1117 | include/linux/bounds.h include/asm*/asm-offsets.h \ | ||
1117 | Module.symvers tags TAGS cscope* | 1118 | Module.symvers tags TAGS cscope* |
1118 | 1119 | ||
1119 | # clean - Delete most, but leave enough to build external modules | 1120 | # clean - Delete most, but leave enough to build external modules |
@@ -1431,7 +1432,7 @@ define xtags | |||
1431 | elif $1 --version 2>&1 | grep -iq emacs; then \ | 1432 | elif $1 --version 2>&1 | grep -iq emacs; then \ |
1432 | $(all-sources) | xargs $1 -a; \ | 1433 | $(all-sources) | xargs $1 -a; \ |
1433 | $(all-kconfigs) | xargs $1 -a \ | 1434 | $(all-kconfigs) | xargs $1 -a \ |
1434 | --regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \ | 1435 | --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \ |
1435 | $(all-defconfigs) | xargs -r $1 -a \ | 1436 | $(all-defconfigs) | xargs -r $1 -a \ |
1436 | --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \ | 1437 | --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \ |
1437 | else \ | 1438 | else \ |