diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /arch/arm/mach-nomadik/clock.c | |
parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-nomadik/clock.c')
-rw-r--r-- | arch/arm/mach-nomadik/clock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-nomadik/clock.c b/arch/arm/mach-nomadik/clock.c index 60f5bee09f2e..2c471fc451d7 100644 --- a/arch/arm/mach-nomadik/clock.c +++ b/arch/arm/mach-nomadik/clock.c | |||
@@ -56,6 +56,7 @@ static struct clk_lookup lookups[] = { | |||
56 | CLK(&clk_default, "gpio.1"), | 56 | CLK(&clk_default, "gpio.1"), |
57 | CLK(&clk_default, "gpio.2"), | 57 | CLK(&clk_default, "gpio.2"), |
58 | CLK(&clk_default, "gpio.3"), | 58 | CLK(&clk_default, "gpio.3"), |
59 | CLK(&clk_default, "rng"), | ||
59 | }; | 60 | }; |
60 | 61 | ||
61 | static int __init clk_init(void) | 62 | static int __init clk_init(void) |