Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

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

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