diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-18 17:56:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-18 17:56:29 -0500 |
| commit | 37b797b270a81248f839629ddeb382a35c7b0d30 (patch) | |
| tree | b77e2126c5e15697901b6f96cdbbda38414d2850 /arch/arm/mach-omap1/serial.c | |
| parent | 1e74c891252941ac195bb47978f079c592271a3f (diff) | |
| parent | 30ff720b40ba64b0e9c8974673b95970e68503ac (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream
Diffstat (limited to 'arch/arm/mach-omap1/serial.c')
| -rw-r--r-- | arch/arm/mach-omap1/serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 7a68f098a025..e924e0c6a4ce 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
| @@ -146,7 +146,7 @@ void __init omap_serial_init(void) | |||
| 146 | if (IS_ERR(uart1_ck)) | 146 | if (IS_ERR(uart1_ck)) |
| 147 | printk("Could not get uart1_ck\n"); | 147 | printk("Could not get uart1_ck\n"); |
| 148 | else { | 148 | else { |
| 149 | clk_use(uart1_ck); | 149 | clk_enable(uart1_ck); |
| 150 | if (cpu_is_omap1510()) | 150 | if (cpu_is_omap1510()) |
| 151 | clk_set_rate(uart1_ck, 12000000); | 151 | clk_set_rate(uart1_ck, 12000000); |
| 152 | } | 152 | } |
| @@ -166,7 +166,7 @@ void __init omap_serial_init(void) | |||
| 166 | if (IS_ERR(uart2_ck)) | 166 | if (IS_ERR(uart2_ck)) |
| 167 | printk("Could not get uart2_ck\n"); | 167 | printk("Could not get uart2_ck\n"); |
| 168 | else { | 168 | else { |
| 169 | clk_use(uart2_ck); | 169 | clk_enable(uart2_ck); |
| 170 | if (cpu_is_omap1510()) | 170 | if (cpu_is_omap1510()) |
| 171 | clk_set_rate(uart2_ck, 12000000); | 171 | clk_set_rate(uart2_ck, 12000000); |
| 172 | else | 172 | else |
| @@ -188,7 +188,7 @@ void __init omap_serial_init(void) | |||
| 188 | if (IS_ERR(uart3_ck)) | 188 | if (IS_ERR(uart3_ck)) |
| 189 | printk("Could not get uart3_ck\n"); | 189 | printk("Could not get uart3_ck\n"); |
| 190 | else { | 190 | else { |
| 191 | clk_use(uart3_ck); | 191 | clk_enable(uart3_ck); |
| 192 | if (cpu_is_omap1510()) | 192 | if (cpu_is_omap1510()) |
| 193 | clk_set_rate(uart3_ck, 12000000); | 193 | clk_set_rate(uart3_ck, 12000000); |
| 194 | } | 194 | } |