diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /arch/powerpc/kernel/irq.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index b0e5deb4274f..292163f5b39a 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -143,7 +143,6 @@ void local_irq_restore(unsigned long en) | |||
| 143 | */ | 143 | */ |
| 144 | if (local_paca->lppaca_ptr->int_dword.any_int) | 144 | if (local_paca->lppaca_ptr->int_dword.any_int) |
| 145 | iseries_handle_interrupts(); | 145 | iseries_handle_interrupts(); |
| 146 | return; | ||
| 147 | } | 146 | } |
| 148 | 147 | ||
| 149 | /* | 148 | /* |