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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
coyote-setup.c
diff --git
a/arch/arm/mach-ixp4xx/coyote-setup.c
b/arch/arm/mach-ixp4xx/coyote-setup.c
index
bc6e0d0
..
03ad0b7
100644
(file)
--- a/
arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/
arch/arm/mach-ixp4xx/coyote-setup.c
@@
-63,7
+63,7
@@
static struct resource coyote_flash_resource = {
.flags = IORESOURCE_MEM,
};
.flags = IORESOURCE_MEM,
};
-static struct platform_device coyote_flash
_device
= {
+static struct platform_device coyote_flash = {
.name = "IXP4XX-Flash",
.id = 0,
.dev = {
.name = "IXP4XX-Flash",
.id = 0,
.dev = {
@@
-73,9
+73,13
@@
static struct platform_device coyote_flash_device = {
.resource = &coyote_flash_resource,
};
.resource = &coyote_flash_resource,
};
+static struct platform_device *coyote_devices[] __initdata = {
+ &coyote_flash
+};
+
static void __init coyote_init(void)
{
static void __init coyote_init(void)
{
- platform_add_device
(&coyote_flash_device
);
+ platform_add_device
s(&coyote_devices, ARRAY_SIZE(coyote_devices)
);
}
MACHINE_START(ADI_COYOTE, "ADI Engineering IXP4XX Coyote Development Platform")
}
MACHINE_START(ADI_COYOTE, "ADI Engineering IXP4XX Coyote Development Platform")
@@
-84,6
+88,7
@@
MACHINE_START(ADI_COYOTE, "ADI Engineering IXP4XX Coyote Development Platform")
IXP4XX_PERIPHERAL_BASE_VIRT)
MAPIO(coyote_map_io)
INITIRQ(ixp4xx_init_irq)
IXP4XX_PERIPHERAL_BASE_VIRT)
MAPIO(coyote_map_io)
INITIRQ(ixp4xx_init_irq)
+ INITTIME(ixp4xx_init_time)
BOOT_PARAMS(0x0100)
INIT_MACHINE(coyote_init)
MACHINE_END
BOOT_PARAMS(0x0100)
INIT_MACHINE(coyote_init)
MACHINE_END