Merge branch 'linux-2.6'

[linux-2.6] / include / asm-parisc / elf.h

diff --git a/include/asm-parisc/elf.h b/include/asm-parisc/elf.h
index adea65fc43c904e5da19bd29e88741b8f2b2368e..f628ac7de83dca17868b3737732b00c61354f62a 100644 (file)
--- a/include/asm-parisc/elf.h
+++ b/include/asm-parisc/elf.h
@@ -220,7 +220,7 @@ typedef struct elf64_fdesc {
  * macros, and then it includes fs/binfmt_elf.c to provide an alternate
  * elf binary handler for 32 bit binaries (on the 64 bit kernel).
  */
-#ifdef __LP64__
+#ifdef CONFIG_64BIT
 #define ELF_CLASS       ELFCLASS64
 #else
 #define ELF_CLASS      ELFCLASS32