diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-08-22 06:02:57 +0200 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-08-22 06:02:57 +0200 |
| commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
| tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /arch/arm/mach-mxs/mm-mx23.c | |
| parent | ocfs2: Avoid livelock in ocfs2_readpage() (diff) | |
| parent | ocfs2: Implement llseek() (diff) | |
| download | linux-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.xz linux-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.zip | |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'arch/arm/mach-mxs/mm-mx23.c')
| -rw-r--r-- | arch/arm/mach-mxs/mm-mx23.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mm-mx23.c b/arch/arm/mach-mxs/mm-mx23.c index 5148cd64a6b7..1b2345ac1a87 100644 --- a/arch/arm/mach-mxs/mm-mx23.c +++ b/arch/arm/mach-mxs/mm-mx23.c @@ -41,5 +41,4 @@ void __init mx23_map_io(void) void __init mx23_init_irq(void) { icoll_init_irq(); - mx23_register_gpios(); } |