diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 11:34:46 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 11:34:46 -0500 |
| commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
| tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /arch/sparc/include/asm/floppy_64.h | |
| parent | e363bbac316ffb5daaf45d855f82680148cafe20 (diff) | |
| parent | 355e62f5ad12b005c862838156262eb2df2f8dff (diff) | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'arch/sparc/include/asm/floppy_64.h')
| -rw-r--r-- | arch/sparc/include/asm/floppy_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h index e204f902e6c9..7c90c50c200d 100644 --- a/arch/sparc/include/asm/floppy_64.h +++ b/arch/sparc/include/asm/floppy_64.h | |||
| @@ -254,7 +254,7 @@ static int sun_fd_request_irq(void) | |||
| 254 | once = 1; | 254 | once = 1; |
| 255 | 255 | ||
| 256 | error = request_irq(FLOPPY_IRQ, sparc_floppy_irq, | 256 | error = request_irq(FLOPPY_IRQ, sparc_floppy_irq, |
| 257 | IRQF_DISABLED, "floppy", NULL); | 257 | 0, "floppy", NULL); |
| 258 | 258 | ||
| 259 | return ((error == 0) ? 0 : -1); | 259 | return ((error == 0) ? 0 : -1); |
| 260 | } | 260 | } |