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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-mxc
/
tzic.c
diff --git
a/arch/arm/plat-mxc/tzic.c
b/arch/arm/plat-mxc/tzic.c
index 9b86d2a60d43789a22d644105981815169123dd7..b3da9aad4295704ef9ea8a4a43c95127d74e6d9e 100644
(file)
--- a/
arch/arm/plat-mxc/tzic.c
+++ b/
arch/arm/plat-mxc/tzic.c
@@
-145,8
+145,6
@@
void __init tzic_init_irq(void __iomem *irqbase)
set_irq_handler(i, handle_level_irq);
set_irq_flags(i, IRQF_VALID);
}
- mxc_register_gpios();
-
pr_info("TrustZone Interrupt Controller (TZIC) initialized\n");
}