diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
| commit | 9c9ab385bc6c3f0787f742d5e9baf04063d9697a (patch) | |
| tree | cc6ac425f7580a40d011ad2e8fc7974678843e0b /arch/arm/mach-iop13xx/msi.c | |
| parent | 93f13a9f96771a064c716364aebc6e283b186eb8 (diff) | |
| parent | bcee19f424a0d8c26ecf2607b73c690802658b29 (diff) | |
| download | talos-op-linux-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.tar.gz talos-op-linux-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.zip | |
Merge branch 'linus' into x86/asm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-iop13xx/msi.c')
| -rw-r--r-- | arch/arm/mach-iop13xx/msi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c index 9f89e76dfbb9..f6235b28578c 100644 --- a/arch/arm/mach-iop13xx/msi.c +++ b/arch/arm/mach-iop13xx/msi.c @@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = { write_imipr_3, }; -static void iop13xx_msi_handler(unsigned int irq, struct irq_desc *desc) +static void iop13xx_msi_handler(struct irq_desc *desc) { int i, j; unsigned long status; |
