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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
assabet.c
diff --git
a/arch/arm/mach-sa1100/assabet.c
b/arch/arm/mach-sa1100/assabet.c
index
a599bb0
..
be06d66
100644
(file)
--- a/
arch/arm/mach-sa1100/assabet.c
+++ b/
arch/arm/mach-sa1100/assabet.c
@@
-9,7
+9,6
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@
-26,6
+25,7
@@
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/page.h>
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/page.h>
+#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>