diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2012-01-12 20:20:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 23:13:12 -0500 |
commit | 45dac90f0ca7d9efeda8f3d416c808c71207bf20 (patch) | |
tree | c188c5a6b1661217b4cfb10940a2ccf91e057bc1 | |
parent | 6e6f0a1f0fa6bba1493c296eb30d1e176e1f8530 (diff) |
drivers/parport/parport_pc.c: fix warnings
drivers/parport/parport_pc.c: In function '__check_irq':
drivers/parport/parport_pc.c:3415: warning: return from incompatible pointer type
drivers/parport/parport_pc.c: In function '__check_dma':
drivers/parport/parport_pc.c:3417: warning: return from incompatible pointer type
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/parport/parport_pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index d0b597b50398..0cb64f50cecd 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -3404,8 +3404,8 @@ static int __init parport_init_mode_setup(char *str) | |||
3404 | #endif | 3404 | #endif |
3405 | 3405 | ||
3406 | #ifdef MODULE | 3406 | #ifdef MODULE |
3407 | static const char *irq[PARPORT_PC_MAX_PORTS]; | 3407 | static char *irq[PARPORT_PC_MAX_PORTS]; |
3408 | static const char *dma[PARPORT_PC_MAX_PORTS]; | 3408 | static char *dma[PARPORT_PC_MAX_PORTS]; |
3409 | 3409 | ||
3410 | MODULE_PARM_DESC(io, "Base I/O address (SPP regs)"); | 3410 | MODULE_PARM_DESC(io, "Base I/O address (SPP regs)"); |
3411 | module_param_array(io, int, NULL, 0); | 3411 | module_param_array(io, int, NULL, 0); |