diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
| commit | c602c65b2f81d14456771d1e3f15d1381f4b7efa (patch) | |
| tree | f1f833c8dd6c1519eeb101be32f7fe54a9605af5 /Makefile | |
| parent | 3834f47291df475be3f0f0fb7ccaa098967cc054 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into sfi-release
Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 = -rc8 | 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 |