diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-11 14:37:45 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-11 14:37:45 -0700 |
commit | ecdf94da6f91310d08081e05db78a6c997b44e4b (patch) | |
tree | 0528ddc7e2b34046b3bd98dedf89ca7fee40c1ae /include/linux/netdevice.h | |
parent | e28f23d8aaf3c3455edcdf646d910757051a07e3 (diff) | |
parent | c65b99f046843d2455aa231747b5a07a999a9f3d (diff) | |
download | linux-next-ecdf94da6f91310d08081e05db78a6c997b44e4b.tar.gz |
Merge tag 'v4.1-rc6' into next/dt
Linux 4.1-rc6
Conflicts:
arch/arm/boot/dts/zynq-7000.dtsi
Resolution summary:
Mainline had an earlier version of the commit, resolve in favor of the
newer patch in next/dt branch.
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. */ |