projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge HEAD from ../linux-2.6
[powerpc.git]
/
arch
/
arm
/
mach-sa1100
/
pleb.c
diff --git
a/arch/arm/mach-sa1100/pleb.c
b/arch/arm/mach-sa1100/pleb.c
index
e17b58f
..
0709eba
100644
(file)
--- a/
arch/arm/mach-sa1100/pleb.c
+++ b/
arch/arm/mach-sa1100/pleb.c
@@
-6,7
+6,7
@@
#include <linux/kernel.h>
#include <linux/tty.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/tty.h>
#include <linux/ioport.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/partitions.h>
@@
-146,7
+146,6
@@
static void __init pleb_map_io(void)
}
MACHINE_START(PLEB, "PLEB")
}
MACHINE_START(PLEB, "PLEB")
- .phys_ram = 0xc0000000,
.phys_io = 0x80000000,
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.map_io = pleb_map_io,
.phys_io = 0x80000000,
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.map_io = pleb_map_io,