diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-27 14:40:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-27 14:40:10 +0200 |
| commit | d563a6bb3d107bf62ec7cd852a142d7e93f0db79 (patch) | |
| tree | 9902cb7c599126341a8fb32e572305c04fffb9c8 /include/linux/netdevice.h | |
| parent | 1fcb61c52bbdbbc46d132acf7dab9ad0eca433fe (diff) | |
| parent | ba155e2d21f6bf05de86a78dbe5bfd8757604a65 (diff) | |
| download | cachepc-linux-d563a6bb3d107bf62ec7cd852a142d7e93f0db79.tar.gz cachepc-linux-d563a6bb3d107bf62ec7cd852a142d7e93f0db79.zip | |
Merge tag 'v4.1-rc5' into x86/mm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1899c74a7127..05b9a694e213 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -25,7 +25,6 @@ #ifndef _LINUX_NETDEVICE_H #define _LINUX_NETDEVICE_H -#include <linux/pm_qos.h> #include <linux/timer.h> #include <linux/bug.h> #include <linux/delay.h> @@ -1499,8 +1498,6 @@ enum netdev_priv_flags { * * @qdisc_tx_busylock: XXX: need comments on this one * - * @pm_qos_req: Power Management QoS object - * * FIXME: cleanup struct net_device such that network protocol info * moves out. */ |