linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-frv / highmem.h

diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h
index e2247c2..295f74a 100644 (file)
--- 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;
        }
 }