X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-frv%2Fhighmem.h;h=295f74a57f22975fe01f44170e5d12a587536c68;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=e2247c22a638aec316a72383d7bc9f77e191dcb6;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h
index e2247c22a..295f74a57 100644
--- a/include/asm-frv/highmem.h
+++ b/include/asm-frv/highmem.h
@@ -17,6 +17,7 @@
 
 #ifdef __KERNEL__
 
+#include <linux/config.h>
 #include <linux/init.h>
 #include <asm/mem-layout.h>
 #include <asm/spr-regs.h>
@@ -134,7 +135,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
 
 	default:
 		BUG();
-		return NULL;
+		return 0;
 	}
 }