diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
| commit | 638cbac8de9b57345a9446e107b6aebc10b58970 (patch) | |
| tree | e445fe3a1b8ad718d7ee770ed1c7a43e3eb5a611 /include/asm-powerpc/vdso.h | |
| parent | f055408957750cf759162c364c2a4dfe19765844 (diff) | |
| parent | fc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-powerpc/vdso.h')
| -rw-r--r-- | include/asm-powerpc/vdso.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/vdso.h b/include/asm-powerpc/vdso.h index 85d8a7be25c..b9f9118b160 100644 --- a/include/asm-powerpc/vdso.h +++ b/include/asm-powerpc/vdso.h @@ -11,7 +11,7 @@ #define VDSO32_MBASE VDSO32_LBASE #define VDSO64_MBASE VDSO64_LBASE -#define VDSO_VERSION_STRING LINUX_2.6.12 +#define VDSO_VERSION_STRING LINUX_2.6.15 /* Define if 64 bits VDSO has procedure descriptors */ #undef VDS64_HAS_DESCRIPTORS |