diff --git a/[refs] b/[refs] index 8ee0611d8102..1cc6f18346b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d39a464970185f2592cb06aa42a88764bcb12e32 +refs/heads/master: b18a4d6d7d1b10c2c727de925c4883df432aa1a5 diff --git a/trunk/drivers/staging/mei/main.c b/trunk/drivers/staging/mei/main.c index 4f46738617a2..5e910108ba3c 100644 --- a/trunk/drivers/staging/mei/main.c +++ b/trunk/drivers/staging/mei/main.c @@ -42,7 +42,6 @@ #include "interface.h" -#define MEI_READ_TIMEOUT 45 #define MEI_DRIVER_NAME "mei" #define MEI_DEV_NAME "mei"