diff --git a/[refs] b/[refs] index 13514dfc3906..af7205234042 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41d8532b5fc61fb384980cf3e19e61c12a02c87d +refs/heads/master: c8bfbd5dd1042ef2563267082ce03efe2b2422d1 diff --git a/trunk/drivers/staging/otus/zdcompat.h b/trunk/drivers/staging/otus/zdcompat.h index 8acf400fbc0b..d9a3b2d5ba1e 100644 --- a/trunk/drivers/staging/otus/zdcompat.h +++ b/trunk/drivers/staging/otus/zdcompat.h @@ -45,13 +45,6 @@ struct iw_request_info #endif #endif -#ifndef IRQ_NONE -typedef void irqreturn_t; -#define IRQ_NONE -#define IRQ_HANDLED -#define IRQ_RETVAL(x) -#endif - #ifndef in_atomic #define in_atomic() 0 #endif