clk: ux500: fix mismatched types

As reported by Rob Herring[1] there were some mismatched types between
drivers/clk/ux500/clk.h and the corresponding function definitions:

drivers/clk/ux500/clk-prcc.c:145:13: error: conflicting types for 'clk_reg_prcc_pclk'
drivers/clk/ux500/clk-prcc.c:155:13: error: conflicting types for 'clk_reg_prcc_kclk'

[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/232246

Signed-off-by: Mike Turquette <mturquette@linaro.org>
Cc: Rob Herring <robherring2@gmail.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/.vimrc b/.vimrc
index 545b3d1..c83e1d3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -8,6 +8,11 @@ set hidden		" allow buffer switching without saving
 set hlsearch
 " Type-ahead find
 set incsearch
+" Use <C-L> to clear the highlighting of :set hlsearch.
+" Taken from https://github.com/tpope/vim-sensible/blob/master/plugin/sensible.vim
+if maparg('<C-L>', 'n') ==# ''
+  nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
+endif
 
 " Indent of 8, but no spaces
 set shiftwidth=8