summaryrefslogtreecommitdiff
path: root/arch/arm/mach-realview/realview_pb1176.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-27 15:39:14 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-27 15:39:14 +0300
commite902be56cbf2a48d96d11d6884767e638d41c712 (patch)
treee4d79479a1280ad4841005680e37119d6694c3bf /arch/arm/mach-realview/realview_pb1176.c
parentc750815e2d436f4379c7af8a8770ef2ae71c5607 (diff)
parent5e1dbdb458ada37f7e97265cb2ea87c55fd5d034 (diff)
downloadlinux-e902be56cbf2a48d96d11d6884767e638d41c712.tar.xz
Merge branches 'core' and 'clks' into devel
Diffstat (limited to 'arch/arm/mach-realview/realview_pb1176.c')
-rw-r--r--arch/arm/mach-realview/realview_pb1176.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index cccdb3eb90fe..0481416d37c9 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -265,8 +265,6 @@ static void __init realview_pb1176_init(void)
l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff);
#endif
- clk_register(&realview_clcd_clk);
-
realview_flash_register(&realview_pb1176_flash_resource, 1);
platform_device_register(&realview_pb1176_smsc911x_device);