commit 6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sat Jan 24 16:27:06 2009 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun Feb 08 17:50:22 2009 +0000
tree c63888f76d8b06749970ab328d088d3887b64c16
parent eeec7c8d18465a85c212230bdb715e3f029dbf4e

[ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-omap2/clock24xx.c

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 1e9ac83..d190b6a 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -169,8 +169,8 @@
 	CLK(NULL,	"wdt1_ick",	&wdt1_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"omapctrl_ick",	&omapctrl_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"icr_ick",	&icr_ick,	CK_243X),
-	CLK(NULL,	"cam_fck",	&cam_fck,	CK_243X | CK_242X),
-	CLK(NULL,	"cam_ick",	&cam_ick,	CK_243X | CK_242X),
+	CLK("omap24xxcam", "fck",	&cam_fck,	CK_243X | CK_242X),
+	CLK("omap24xxcam", "ick",	&cam_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"mailboxes_ick", &mailboxes_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"wdt4_ick",	&wdt4_ick,	CK_243X | CK_242X),
 	CLK(NULL,	"wdt4_fck",	&wdt4_fck,	CK_243X | CK_242X),