diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
| commit | 75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd (patch) | |
| tree | 7167fa30a5c46766c10c4b9a37d7bf9373c26c6d /include/linux/netdevice.h | |
| parent | 52648e83c9a6b9f7fc3dd272d4d10175e93aa62a (diff) | |
| parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 (diff) | |
Merge branch 'linus' into x86/asm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
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. */ |