diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
| commit | 9a21247181d93fdf99255911845ecdb041d21583 (patch) | |
| tree | 6d69be36f8a2bd8c76bf02ead2f0121a511c0a92 /Makefile | |
| parent | c752666c17f870fa8ae9f16804dd457e9e6daaec (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'master'
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 = 16 | 3 | SUBLEVEL = 16 |
| 4 | EXTRAVERSION =-rc5 | 4 | EXTRAVERSION = |
| 5 | NAME=Sliding Snow Leopard | 5 | NAME=Sliding Snow Leopard |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -905,7 +905,7 @@ define filechk_version.h | |||
| 905 | ) | 905 | ) |
| 906 | endef | 906 | endef |
| 907 | 907 | ||
| 908 | include/linux/version.h: $(srctree)/Makefile .config FORCE | 908 | include/linux/version.h: $(srctree)/Makefile .config .kernelrelease FORCE |
| 909 | $(call filechk,version.h) | 909 | $(call filechk,version.h) |
| 910 | 910 | ||
| 911 | # --------------------------------------------------------------------------- | 911 | # --------------------------------------------------------------------------- |