diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-26 16:04:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-26 16:04:29 -0700 |
| commit | fc915c8b930c3114f2a838f7e2cd8789ad6fedc3 (patch) | |
| tree | 795197f8ec2bc5ba42ee975ecd4d5a16c64e063c /arch/arm/mach-imx/clk-imx31.c | |
| parent | fe89def79c48e2149abdd1e816523e69a9067191 (diff) | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
| download | op-kernel-dev-fc915c8b930c3114f2a838f7e2cd8789ad6fedc3.zip op-kernel-dev-fc915c8b930c3114f2a838f7e2cd8789ad6fedc3.tar.gz | |
Merge 3.5-rc4 into tty-next
This is to pick up the serial port and tty changes in Linus's tree to allow
everyone to sync up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-imx/clk-imx31.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx31.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c index a854b9c..c9a06d8 100644 --- a/arch/arm/mach-imx/clk-imx31.c +++ b/arch/arm/mach-imx/clk-imx31.c @@ -175,8 +175,7 @@ int __init mx31_clocks_init(unsigned long fref) mx31_revision(); clk_disable_unprepare(clk[iim_gate]); - mxc_timer_init(NULL, MX31_IO_ADDRESS(MX31_GPT1_BASE_ADDR), - MX31_INT_GPT); + mxc_timer_init(MX31_IO_ADDRESS(MX31_GPT1_BASE_ADDR), MX31_INT_GPT); return 0; } |
