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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
pleb.c
diff --git
a/arch/arm/mach-sa1100/pleb.c
b/arch/arm/mach-sa1100/pleb.c
index
5606bd7
..
c7bf7e0
100644
(file)
--- a/
arch/arm/mach-sa1100/pleb.c
+++ b/
arch/arm/mach-sa1100/pleb.c
@@
-6,7
+6,8
@@
#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/irq.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/partitions.h>
@@
-146,9
+147,10
@@
static void __init pleb_map_io(void)
}
MACHINE_START(PLEB, "PLEB")
}
MACHINE_START(PLEB, "PLEB")
- BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
- MAPIO(pleb_map_io)
- INITIRQ(sa1100_init_irq)
+ .phys_io = 0x80000000,
+ .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
+ .map_io = pleb_map_io,
+ .init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.init_machine = pleb_init,
MACHINE_END
.timer = &sa1100_timer,
.init_machine = pleb_init,
MACHINE_END