diff --git a/[refs] b/[refs] index 3db8c9d1b675..2c6c4cc07573 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a5778aa000ebfec7f07eed0ffa2852ffb5d16bb +refs/heads/master: a1467085dcad8214bbb1d7edafbaa295cbd8c0e7 diff --git a/trunk/include/linux/ethtool.h b/trunk/include/linux/ethtool.h index a3cac53a0766..cca1c3de140d 100644 --- a/trunk/include/linux/ethtool.h +++ b/trunk/include/linux/ethtool.h @@ -14,7 +14,6 @@ #define _LINUX_ETHTOOL_H #include -#include /* This should work for both 32 and 64 bit userland. */ struct ethtool_cmd { @@ -409,6 +408,8 @@ struct ethtool_flash { #ifdef __KERNEL__ +#include + struct ethtool_rx_ntuple_flow_spec_container { struct ethtool_rx_ntuple_flow_spec fs; struct list_head list;