comedi doesn't like the new irqreturn_t

comedi doesn't like the new irqreturn_t

[Geert Uytterhoeven]

On m68k:
| In file included from drivers/staging/comedi/comedidev.h:40,
|                  from drivers/staging/comedi/comedi_fops.c:45:
| drivers/staging/comedi/interrupt.h:30:1: warning: "IRQ_RETVAL" redefined
| In file included from include/linux/interrupt.h:10,
|                  from drivers/staging/comedi/interrupt.h:22,
|                  from drivers/staging/comedi/comedidev.h:40,
|                  from drivers/staging/comedi/comedi_fops.c:45:
| include/linux/irqreturn.h:15:1: warning: this is the location of the previous definition
| In file included from drivers/staging/comedi/comedidev.h:41,
|                  from drivers/staging/comedi/comedi_fops.c:46:
| drivers/staging/comedi/interrupt.h:27: error: conflicting types for 'irqreturn_t'
| include/linux/irqreturn.h:14: error: previous declaration of 'irqreturn_t' was here
| make[6]: *** [drivers/staging/comedi/comedi_fops.o] Error 1

I suspect a similar problem with drivers/staging/otus, but that one isn't
compiled on m68k due to its dependency on USB.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds