diff options
author | Tony Lindgren <tony@atomide.com> | 2010-08-04 08:46:24 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 08:46:24 +0300 |
commit | 331d919af416b9b92428947ef8c535a3e24c6b31 (patch) | |
tree | 1f58dfe4ea6ed130f7b970f07cd7589864e9cbad /arch/arm/mach-omap1/clock.h | |
parent | 047b51fb208c716294b4682c904df8a3ad8b6a69 (diff) | |
parent | fb8ce14c7e16bd218decb3e1655c5d4ff08042f2 (diff) | |
download | kernel_samsung_crespo-331d919af416b9b92428947ef8c535a3e24c6b31.zip kernel_samsung_crespo-331d919af416b9b92428947ef8c535a3e24c6b31.tar.gz kernel_samsung_crespo-331d919af416b9b92428947ef8c535a3e24c6b31.tar.bz2 |
Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/clock.h')
-rw-r--r-- | arch/arm/mach-omap1/clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 75d0d7d..eaf09ef 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -107,7 +107,7 @@ extern struct clk *api_ck_p, *ck_dpll1_p, *ck_ref_p; extern const struct clkops clkops_dspck; extern const struct clkops clkops_dummy; -extern const struct clkops clkops_uart; +extern const struct clkops clkops_uart_16xx; extern const struct clkops clkops_generic; #endif |