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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
mn10300
/
include
/
asm
/
pgalloc.h
diff --git
a/arch/mn10300/include/asm/pgalloc.h
b/arch/mn10300/include/asm/pgalloc.h
index
a19f113
..
146bacf
100644
(file)
--- a/
arch/mn10300/include/asm/pgalloc.h
+++ b/
arch/mn10300/include/asm/pgalloc.h
@@
-11,7
+11,6
@@
#ifndef _ASM_PGALLOC_H
#define _ASM_PGALLOC_H
#ifndef _ASM_PGALLOC_H
#define _ASM_PGALLOC_H
-#include <asm/processor.h>
#include <asm/page.h>
#include <linux/threads.h>
#include <linux/mm.h> /* for struct page */
#include <asm/page.h>
#include <linux/threads.h>
#include <linux/mm.h> /* for struct page */