Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[sfrench/cifs-2.6.git] / arch / arm / mach-sa1100 / shannon.c

diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index ddd917d1083d79c4d04da6d2ced5248322672e3b..85e82bb73d7ef7b3244428954949716906ebdd8e 100644 (file)
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -59,8 +59,8 @@ static struct mcp_plat_data shannon_mcp_data = {
 
 static void __init shannon_init(void)
 {
-       sa11x0_set_flash_data(&shannon_flash_data, &shannon_flash_resource, 1);
-       sa11x0_set_mcp_data(&shannon_mcp_data);
+       sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1);
+       sa11x0_register_mcp(&shannon_mcp_data);
 }
 
 static void __init shannon_map_io(void)