diff --git a/[refs] b/[refs] index d8c5a15c8116..7401e0e3b9e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35edd9103c84f2b37f63227d12765c38f30495c5 +refs/heads/master: 6c03438edeb5c359af35f060ea016ca65671c269 diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index 5dba983b8d65..bef5480396d0 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -20,7 +20,6 @@ #include #include #include -#include #define USHRT_MAX ((u16)(~0U)) #define SHRT_MAX ((s16)(USHRT_MAX>>1))