diff options
author | Ben Dooks <ben-linux@fluff.org> | 2007-04-20 06:15:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-04-21 15:53:14 -0400 |
commit | ce89c206ac03dfec700cfa538dcbcc347c0683ce (patch) | |
tree | 5bab53a9eb4a71bcf1903a81a9b0b3eba925d43e /arch/arm/mach-s3c2440/mach-osiris.c | |
parent | ef08574729bcf65bbd1f0c9ad9b9baa9bbd7a830 (diff) |
[ARM] 4324/1: S3C24XX: remove clocks from s3c24xx_board
Remove the clocks from the s3c24xx_board as part
of the process of simplifying the initialisation
sequence by removing struct s3c24xx_board.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-osiris.c')
-rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 2ed8e51f20c8..c9872210ab5a 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
@@ -254,8 +254,6 @@ static struct clk *osiris_clocks[] = { | |||
254 | static struct s3c24xx_board osiris_board __initdata = { | 254 | static struct s3c24xx_board osiris_board __initdata = { |
255 | .devices = osiris_devices, | 255 | .devices = osiris_devices, |
256 | .devices_count = ARRAY_SIZE(osiris_devices), | 256 | .devices_count = ARRAY_SIZE(osiris_devices), |
257 | .clocks = osiris_clocks, | ||
258 | .clocks_count = ARRAY_SIZE(osiris_clocks), | ||
259 | }; | 257 | }; |
260 | 258 | ||
261 | static void __init osiris_map_io(void) | 259 | static void __init osiris_map_io(void) |
@@ -275,6 +273,8 @@ static void __init osiris_map_io(void) | |||
275 | 273 | ||
276 | s3c24xx_uclk.parent = &s3c24xx_clkout1; | 274 | s3c24xx_uclk.parent = &s3c24xx_clkout1; |
277 | 275 | ||
276 | s3c24xx_register_clocks(osiris_clocks, ARRAY_SIZE(osiris_clocks)); | ||
277 | |||
278 | s3c_device_nand.dev.platform_data = &osiris_nand_info; | 278 | s3c_device_nand.dev.platform_data = &osiris_nand_info; |
279 | 279 | ||
280 | s3c24xx_init_io(osiris_iodesc, ARRAY_SIZE(osiris_iodesc)); | 280 | s3c24xx_init_io(osiris_iodesc, ARRAY_SIZE(osiris_iodesc)); |