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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
prpmc1100-setup.c
diff --git
a/arch/arm/mach-ixp4xx/prpmc1100-setup.c
b/arch/arm/mach-ixp4xx/prpmc1100-setup.c
index
b060320
..
ed42815
100644
(file)
--- a/
arch/arm/mach-ixp4xx/prpmc1100-setup.c
+++ b/
arch/arm/mach-ixp4xx/prpmc1100-setup.c
@@
-8,6
+8,7
@@
* Author: Deepak Saxena <dsaxena@plexity.net>
*/
* Author: Deepak Saxena <dsaxena@plexity.net>
*/
+#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/serial.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/serial.h>
@@
-63,7
+64,7
@@
static struct resource prpmc1100_flash_resource = {
.flags = IORESOURCE_MEM,
};
.flags = IORESOURCE_MEM,
};
-static struct platform_device prpmc1100_flash
_device
= {
+static struct platform_device prpmc1100_flash = {
.name = "IXP4XX-Flash",
.id = 0,
.dev = {
.name = "IXP4XX-Flash",
.id = 0,
.dev = {
@@
-73,9
+74,15
@@
static struct platform_device prpmc1100_flash_device = {
.resource = &prpmc1100_flash_resource,
};
.resource = &prpmc1100_flash_resource,
};
+static struct platform_device *prpmc1100_devices[] __initdata = {
+ &prpmc1100_flash
+};
+
static void __init prpmc1100_init(void)
{
static void __init prpmc1100_init(void)
{
- platform_add_device(&prpmc1100_flash_device);
+ ixp4xx_sys_init();
+
+ platform_add_devices(prpmc1100_devices, ARRAY_SIZE(prpmc1100_devices));
}
MACHINE_START(PRPMC1100, "Motorola PrPMC1100")
}
MACHINE_START(PRPMC1100, "Motorola PrPMC1100")
@@
-84,6
+91,7
@@
MACHINE_START(PRPMC1100, "Motorola PrPMC1100")
IXP4XX_PERIPHERAL_BASE_VIRT)
MAPIO(prpmc1100_map_io)
INITIRQ(ixp4xx_init_irq)
IXP4XX_PERIPHERAL_BASE_VIRT)
MAPIO(prpmc1100_map_io)
INITIRQ(ixp4xx_init_irq)
+ .timer = &ixp4xx_timer,
BOOT_PARAMS(0x0100)
INIT_MACHINE(prpmc1100_init)
MACHINE_END
BOOT_PARAMS(0x0100)
INIT_MACHINE(prpmc1100_init)
MACHINE_END