diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:52:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:53:10 -0400 |
| commit | 45bd00d31de886f8425b4dd33204b911b0a466a9 (patch) | |
| tree | 06204f2452e02ca916666173d50f5035d69065ef /Makefile | |
| parent | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (diff) | |
| parent | ab86e5765d41a5eb4239a1c04d613db87bea5ed8 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: Pick up kernel/softirq.c update for dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 = 31 | 3 | SUBLEVEL = 31 |
| 4 | EXTRAVERSION = -rc9 | 4 | EXTRAVERSION = |
| 5 | NAME = Man-Eating Seals of Antiquity | 5 | NAME = Man-Eating Seals of Antiquity |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -325,7 +325,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ | |||
| 325 | MODFLAGS = -DMODULE | 325 | MODFLAGS = -DMODULE |
| 326 | CFLAGS_MODULE = $(MODFLAGS) | 326 | CFLAGS_MODULE = $(MODFLAGS) |
| 327 | AFLAGS_MODULE = $(MODFLAGS) | 327 | AFLAGS_MODULE = $(MODFLAGS) |
| 328 | LDFLAGS_MODULE = | 328 | LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds |
| 329 | CFLAGS_KERNEL = | 329 | CFLAGS_KERNEL = |
| 330 | AFLAGS_KERNEL = | 330 | AFLAGS_KERNEL = |
| 331 | CFLAGS_GCOV = -fprofile-arcs -ftest-coverage | 331 | CFLAGS_GCOV = -fprofile-arcs -ftest-coverage |