Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6-omap-h63xx.git] / include / linux / mv643xx.h

diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index 955d3069d7271dd0dfc65a26f9e122b7b7b502af..edfa012fad3a93dd1e25b0f84d9bf166a225221e 100644 (file)
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -13,7 +13,7 @@
 #ifndef __ASM_MV643XX_H
 #define __ASM_MV643XX_H
 
-#ifdef __MIPS__
+#ifdef __mips__
 #include <asm/addrspace.h>
 #include <asm/marvell.h>
 #endif