summaryrefslogtreecommitdiffstats
path: root/include/asm-frv/highmem.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-frv/highmem.h')
-rw-r--r--include/asm-frv/highmem.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h
index 295f74a57f2..e2247c22a63 100644
--- 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;
}
}