1 files changed, 9 insertions, 8 deletions

diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c
index 3f0288eb1ed5..b5d387ef37e1 100644
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -281,13 +281,6 @@ static struct clk *anubis_clocks[] = {
         &s3c24xx_uclk,
 };
 
-static struct s3c24xx_board anubis_board __initdata = {
-        .devices       = anubis_devices,
-        .devices_count = ARRAY_SIZE(anubis_devices),
-        .clocks        = anubis_clocks,
-        .clocks_count  = ARRAY_SIZE(anubis_clocks),
-};
-
 static void __init anubis_map_io(void)
 {
         /* initialise the clocks */
@@ -303,23 +296,31 @@ static void __init anubis_map_io(void)
 
         s3c24xx_uclk.parent  = &s3c24xx_clkout1;
 
+        s3c24xx_register_clocks(anubis_clocks, ARRAY_SIZE(anubis_clocks));
+
         s3c_device_nand.dev.platform_data = &anubis_nand_info;
 
         s3c24xx_init_io(anubis_iodesc, ARRAY_SIZE(anubis_iodesc));
         s3c24xx_init_clocks(0);
         s3c24xx_init_uarts(anubis_uartcfgs, ARRAY_SIZE(anubis_uartcfgs));
-        s3c24xx_set_board(&anubis_board);
 
         /* ensure that the GPIO is setup */
         s3c2410_gpio_setpin(S3C2410_GPA0, 1);
 }
 
+static void __init anubis_init(void)
+{
+        platform_add_devices(anubis_devices, ARRAY_SIZE(anubis_devices));
+}
+
+
 MACHINE_START(ANUBIS, "Simtec-Anubis")
         /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
         .phys_io        = S3C2410_PA_UART,
         .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
         .boot_params    = S3C2410_SDRAM_PA + 0x100,
         .map_io         = anubis_map_io,
+        .init_machine   = anubis_init,
         .init_irq       = s3c24xx_init_irq,
         .timer          = &s3c24xx_timer,
 MACHINE_END