Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / include / asm-mips / paccess.h

diff --git a/include/asm-mips/paccess.h b/include/asm-mips/paccess.h
index 46f2d23d26977cf54863322320692abb8132aa19..8c08fa904b2ca6b31f5c444fd1a258c617337c36 100644 (file)
--- a/include/asm-mips/paccess.h
+++ b/include/asm-mips/paccess.h
@@ -13,7 +13,6 @@
 #ifndef _ASM_PACCESS_H
 #define _ASM_PACCESS_H
 
-#include <linux/config.h>
 #include <linux/errno.h>
 
 #ifdef CONFIG_32BIT
@@ -35,7 +34,7 @@ struct __large_pstruct { unsigned long buf[100]; };
 #define __get_dbe(x,ptr,size)                                          \
 ({                                                                     \
        long __gu_err;                                                  \
-       __typeof(*(ptr)) __gu_val;                                      \
+       __typeof__(*(ptr)) __gu_val;                                    \
        unsigned long __gu_addr;                                        \
        __asm__("":"=r" (__gu_val));                                    \
        __gu_addr = (unsigned long) (ptr);                              \