git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-frv
/
highmem.h
diff --git
a/include/asm-frv/highmem.h
b/include/asm-frv/highmem.h
index
295f74a
..
e2247c2
100644
(file)
--- a/
include/asm-frv/highmem.h
+++ b/
include/asm-frv/highmem.h
@@
-17,7
+17,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/init.h>
#include <asm/mem-layout.h>
#include <asm/spr-regs.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();
default:
BUG();
- return
0
;
+ return
NULL
;
}
}
}
}