Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 45dac90f0ca7d9efeda8f3d416c808c71207bf20

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 6e6f0a1f0f
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/parport/parport_pc.c
Diff comments   View file @ 45dac90
... ... @@ -3404,8 +3404,8 @@
3404 3404 #endif
3405 3405  
3406 3406 #ifdef MODULE
3407   -static const char *irq[PARPORT_PC_MAX_PORTS];
3408   -static const char *dma[PARPORT_PC_MAX_PORTS];
  3407 +static char *irq[PARPORT_PC_MAX_PORTS];
  3408 +static char *dma[PARPORT_PC_MAX_PORTS];
3409 3409  
3410 3410 MODULE_PARM_DESC(io, "Base I/O address (SPP regs)");
3411 3411 module_param_array(io, int, NULL, 0);