diff --git a/[refs] b/[refs] index b2b7c5126744..0fbda8816c86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1f91505025db74c261962dc16d58f79b9b0c83c +refs/heads/master: c6350362cbb19882ba0eb3578cc1abc07e6ea204 diff --git a/trunk/drivers/net/ifb.c b/trunk/drivers/net/ifb.c index e4cd6632c7db..d58c4f74f01a 100644 --- a/trunk/drivers/net/ifb.c +++ b/trunk/drivers/net/ifb.c @@ -36,8 +36,6 @@ #include #include -#define TX_TIMEOUT (2*HZ) - #define TX_Q_LIMIT 32 struct ifb_private { struct tasklet_struct ifb_tasklet;