git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-sa1100
/
shannon.c
diff --git
a/arch/arm/mach-sa1100/shannon.c
b/arch/arm/mach-sa1100/shannon.c
index
5aafe0b
..
9ccdd09
100644
(file)
--- a/
arch/arm/mach-sa1100/shannon.c
+++ b/
arch/arm/mach-sa1100/shannon.c
@@
-2,7
+2,6
@@
* linux/arch/arm/mach-sa1100/shannon.c
*/
* linux/arch/arm/mach-sa1100/shannon.c
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/kernel.h>
@@
-10,7
+9,7
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/setup.h>
@@
-18,8
+17,8
@@
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h>
-#include <
asm/ar
ch/mcp.h>
-#include <
asm/ar
ch/shannon.h>
+#include <
ma
ch/mcp.h>
+#include <
ma
ch/shannon.h>
#include "generic.h"
#include "generic.h"