diff options
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-vstms.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-vstms.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c index 4231b549d797..f2fbd65956ac 100644 --- a/arch/arm/mach-s3c2412/mach-vstms.c +++ b/arch/arm/mach-s3c2412/mach-vstms.c | |||
| @@ -129,11 +129,6 @@ static struct platform_device *vstms_devices[] __initdata = { | |||
| 129 | &s3c_device_nand, | 129 | &s3c_device_nand, |
| 130 | }; | 130 | }; |
| 131 | 131 | ||
| 132 | static struct s3c24xx_board vstms_board __initdata = { | ||
| 133 | .devices = vstms_devices, | ||
| 134 | .devices_count = ARRAY_SIZE(vstms_devices) | ||
| 135 | }; | ||
| 136 | |||
| 137 | static void __init vstms_fixup(struct machine_desc *desc, | 132 | static void __init vstms_fixup(struct machine_desc *desc, |
| 138 | struct tag *tags, char **cmdline, | 133 | struct tag *tags, char **cmdline, |
| 139 | struct meminfo *mi) | 134 | struct meminfo *mi) |
| @@ -153,7 +148,11 @@ static void __init vstms_map_io(void) | |||
| 153 | s3c24xx_init_io(vstms_iodesc, ARRAY_SIZE(vstms_iodesc)); | 148 | s3c24xx_init_io(vstms_iodesc, ARRAY_SIZE(vstms_iodesc)); |
| 154 | s3c24xx_init_clocks(12000000); | 149 | s3c24xx_init_clocks(12000000); |
| 155 | s3c24xx_init_uarts(vstms_uartcfgs, ARRAY_SIZE(vstms_uartcfgs)); | 150 | s3c24xx_init_uarts(vstms_uartcfgs, ARRAY_SIZE(vstms_uartcfgs)); |
| 156 | s3c24xx_set_board(&vstms_board); | 151 | } |
| 152 | |||
| 153 | static void __init vstms_init(void) | ||
| 154 | { | ||
| 155 | platform_add_devices(vstms_devices, ARRAY_SIZE(vstms_devices)); | ||
| 157 | } | 156 | } |
| 158 | 157 | ||
| 159 | MACHINE_START(VSTMS, "VSTMS") | 158 | MACHINE_START(VSTMS, "VSTMS") |
| @@ -163,6 +162,7 @@ MACHINE_START(VSTMS, "VSTMS") | |||
| 163 | 162 | ||
| 164 | .fixup = vstms_fixup, | 163 | .fixup = vstms_fixup, |
| 165 | .init_irq = s3c24xx_init_irq, | 164 | .init_irq = s3c24xx_init_irq, |
| 165 | .init_machine = vstms_init, | ||
| 166 | .map_io = vstms_map_io, | 166 | .map_io = vstms_map_io, |
| 167 | .timer = &s3c24xx_timer, | 167 | .timer = &s3c24xx_timer, |
| 168 | MACHINE_END | 168 | MACHINE_END |
