diff --git a/[refs] b/[refs] index c8fb6f1e7e3d..026c0835ec8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39eca2a087e30001b3679c04338976d3b02b9173 +refs/heads/master: 0bf8e27f7a7da413c1cf3dad4afdcf1b17418285 diff --git a/trunk/drivers/staging/comedi/interrupt.h b/trunk/drivers/staging/comedi/interrupt.h index 16532ec7a4b1..3038e461948a 100644 --- a/trunk/drivers/staging/comedi/interrupt.h +++ b/trunk/drivers/staging/comedi/interrupt.h @@ -53,15 +53,8 @@ typedef void irqreturn_t; #endif #endif -/* if interrupt handler prototype has pt_regs* parameter */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) -#define PT_REGS_ARG , struct pt_regs *regs -#define PT_REGS_CALL , regs -#define PT_REGS_NULL , NULL -#else #define PT_REGS_ARG #define PT_REGS_CALL #define PT_REGS_NULL -#endif #endif