summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/cerf.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-10-06 14:55:53 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 16:52:23 +0000
commit7a5b4e16c880f8350d255dc188f81622905618c1 (patch)
tree78ab8222057c0578a641db587081e89bbcbdb1ef /arch/arm/mach-sa1100/cerf.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/cerf.c')
-rw-r--r--arch/arm/mach-sa1100/cerf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index fd3ad9cfc912..bc950ef418af 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -129,8 +129,8 @@ static struct mcp_plat_data cerf_mcp_data = {
static void __init cerf_init(void)
{
platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices));
- sa11x0_set_flash_data(&cerf_flash_data, &cerf_flash_resource, 1);
- sa11x0_set_mcp_data(&cerf_mcp_data);
+ sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1);
+ sa11x0_register_mcp(&cerf_mcp_data);
}
MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")