git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-qong.c
diff --git
a/arch/arm/mach-imx/mach-qong.c
b/arch/arm/mach-imx/mach-qong.c
index
39ceb8c
..
fb25fbd
100644
(file)
--- a/
arch/arm/mach-imx/mach-qong.c
+++ b/
arch/arm/mach-imx/mach-qong.c
@@
-252,7
+252,7
@@
static void __init qong_init(void)
mxc_init_imx_uart();
qong_init_nor_mtd();
qong_init_fpga();
- imx31_add_imx2_wdt(
NULL
);
+ imx31_add_imx2_wdt();
}
static void __init qong_timer_init(void)