diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:14 -0500 |
commit | e902be56cbf2a48d96d11d6884767e638d41c712 (patch) | |
tree | e4d79479a1280ad4841005680e37119d6694c3bf /arch/arm/mach-realview/realview_eb.c | |
parent | c750815e2d436f4379c7af8a8770ef2ae71c5607 (diff) | |
parent | 5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff) |
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'arch/arm/mach-realview/realview_eb.c')
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index eb829eb1ebe2..3420e2e719e6 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -372,8 +372,6 @@ static void __init realview_eb_init(void) | |||
372 | #endif | 372 | #endif |
373 | } | 373 | } |
374 | 374 | ||
375 | clk_register(&realview_clcd_clk); | ||
376 | |||
377 | realview_flash_register(&realview_eb_flash_resource, 1); | 375 | realview_flash_register(&realview_eb_flash_resource, 1); |
378 | platform_device_register(&realview_i2c_device); | 376 | platform_device_register(&realview_i2c_device); |
379 | eth_device_register(); | 377 | eth_device_register(); |