git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
m68knommu
/
mm
/
memory.c
diff --git
a/arch/m68knommu/mm/memory.c
b/arch/m68knommu/mm/memory.c
index
f93b88b
..
8f7949e
100644
(file)
--- a/
arch/m68knommu/mm/memory.c
+++ b/
arch/m68knommu/mm/memory.c
@@
-15,7
+15,6
@@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/types.h>
-#include <linux/slab.h>
#include <asm/segment.h>
#include <asm/page.h>
#include <asm/segment.h>
#include <asm/page.h>
@@
-24,7
+23,6
@@
/*
* Map some physical address range into the kernel address space.
/*
* Map some physical address range into the kernel address space.
- * The code is copied and adapted from map_chunk().
*/
unsigned long kernel_map(unsigned long paddr, unsigned long size,
*/
unsigned long kernel_map(unsigned long paddr, unsigned long size,