aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/collie.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-10-06 09:55:53 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 11:52:23 -0500
commit7a5b4e16c880f8350d255dc188f81622905618c1 (patch)
tree78ab8222057c0578a641db587081e89bbcbdb1ef /arch/arm/mach-sa1100/collie.c
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
ARM: sa11x0: convert set_xxx_data() to register_xxx()
Only register devices if we have platform data for those which require platform data. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
-rw-r--r--arch/arm/mach-sa1100/collie.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index bbf2ebcc3066..be7e5a3c47d0 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -272,9 +272,9 @@ static void __init collie_init(void)
272 printk(KERN_WARNING "collie: Unable to register LoCoMo device\n"); 272 printk(KERN_WARNING "collie: Unable to register LoCoMo device\n");
273 } 273 }
274 274
275 sa11x0_set_flash_data(&collie_flash_data, collie_flash_resources, 275 sa11x0_register_mtd(&collie_flash_data, collie_flash_resources,
276 ARRAY_SIZE(collie_flash_resources)); 276 ARRAY_SIZE(collie_flash_resources));
277 sa11x0_set_mcp_data(&collie_mcp_data); 277 sa11x0_register_mcp(&collie_mcp_data);
278 278
279 sharpsl_save_param(); 279 sharpsl_save_param();
280} 280}