git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-mx3
/
mm.c
diff --git
a/arch/arm/mach-mx3/mm.c
b/arch/arm/mach-mx3/mm.c
index a378fba49a8b0e13de406a6c86436e24aec55d05..20e48c0195c4f8533c7d43113f0ce3965c0ef143 100644
(file)
--- a/
arch/arm/mach-mx3/mm.c
+++ b/
arch/arm/mach-mx3/mm.c
@@
-97,8
+97,8
@@
int imx3x_register_gpios(void);
void __init mx31_init_irq(void)
{
- imx3x_register_gpios();
mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR));
+ imx3x_register_gpios();
}
void __init mx35_init_irq(void)