diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:44:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:44:10 +0200 |
| commit | 6c59c115b0f295434cc4f917d180fecd84d39f81 (patch) | |
| tree | 659a2b63552dd53211f86c60930900520cba3686 /arch/arm/mach-omap1/irq.c | |
| parent | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (diff) | |
| parent | 257d643d7d7cd81075b6dee88cfba14f773805c7 (diff) | |
Merge branch 'omap/4460' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Diffstat (limited to 'arch/arm/mach-omap1/irq.c')
| -rw-r--r-- | arch/arm/mach-omap1/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index 5d3da7a63af3..e2b9c901ab67 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c @@ -175,7 +175,7 @@ static struct irq_chip omap_irq_chip = { .irq_set_wake = omap_wake_irq, }; -void __init omap_init_irq(void) +void __init omap1_init_irq(void) { int i, j; |