Merge ../scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / arch / ia64 / ia32 / ia32priv.h

diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index 68ceb4e690c7a63a91960f750ab6282094938246..703a67c934f84c6619bfa7693c247eb9fca6e143 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;
 };