Pull button into test branch

[pandora-kernel.git] / arch / ia64 / ia32 / ia32priv.h

diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index 68ceb4e..cfa0bc0 100644 (file)
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
@@ -1,7 +1,6 @@
 #ifndef _ASM_IA64_IA32_PRIV_H
 #define _ASM_IA64_IA32_PRIV_H
 
-#include <linux/config.h>
 
 #include <asm/ia32.h>
 
@@ -29,9 +28,9 @@
 struct partial_page {
        struct partial_page     *next; /* linked list, sorted by address */
        struct rb_node          pp_rb;
-       /* 64K is the largest "normal" page supported by ia64 ABI. So 4K*32
+       /* 64K is the largest "normal" page supported by ia64 ABI. So 4K*64
         * should suffice.*/
-       unsigned int            bitmap;
+       unsigned long           bitmap;
        unsigned int            base;
 };
 
@@ -331,8 +330,6 @@ struct old_linux32_dirent {
 void ia64_elf32_init(struct pt_regs *regs);
 #define ELF_PLAT_INIT(_r, load_addr)   ia64_elf32_init(_r)
 
-#define elf_addr_t     u32
-
 /* This macro yields a bitmask that programs can use to figure out
    what instruction set this CPU supports.  */
 #define ELF_HWCAP      0