diff options
| author | Christoph Hellwig <hch@hera.kernel.org> | 2005-05-27 04:16:24 -0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@melbourne.sgi.com> | 2005-05-27 04:16:24 -0400 |
| commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
| tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /Makefile | |
| parent | d3870398fafd4911bd84573b78be4b6b762f32b0 (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 = 12 | 3 | SUBLEVEL = 12 |
| 4 | EXTRAVERSION =-rc3 | 4 | EXTRAVERSION =-rc5 |
| 5 | NAME=Woozy Numbat | 5 | NAME=Woozy Numbat |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -530,7 +530,7 @@ endif | |||
| 530 | include $(srctree)/arch/$(ARCH)/Makefile | 530 | include $(srctree)/arch/$(ARCH)/Makefile |
| 531 | 531 | ||
| 532 | # arch Makefile may override CC so keep this after arch Makefile is included | 532 | # arch Makefile may override CC so keep this after arch Makefile is included |
| 533 | NOSTDINC_FLAGS := -nostdinc -isystem $(shell $(CC) -print-file-name=include) | 533 | NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) |
| 534 | CHECKFLAGS += $(NOSTDINC_FLAGS) | 534 | CHECKFLAGS += $(NOSTDINC_FLAGS) |
| 535 | 535 | ||
| 536 | # warn about C99 declaration after statement | 536 | # warn about C99 declaration after statement |