kernel: bump kernel 4.4 to 4.4.129 for 17.01
[openwrt/openwrt.git] / target / linux / mvebu / patches-4.4 / 043-net-mvneta-sort-the-headers-in-alphabetic-order.patch
1 From: Jisheng Zhang <jszhang@marvell.com>
2 Date: Wed, 20 Jan 2016 19:27:22 +0800
3 Subject: [PATCH] net: mvneta: sort the headers in alphabetic order
4
5 Sorting the headers in alphabetic order will help to reduce the conflict
6 when adding new headers in the future.
7
8 Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
9 Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
10 Signed-off-by: David S. Miller <davem@davemloft.net>
11 ---
12
13 --- a/drivers/net/ethernet/marvell/mvneta.c
14 +++ b/drivers/net/ethernet/marvell/mvneta.c
15 @@ -11,28 +11,28 @@
16 * warranty of any kind, whether express or implied.
17 */
18
19 -#include <linux/kernel.h>
20 -#include <linux/netdevice.h>
21 +#include <linux/clk.h>
22 +#include <linux/cpu.h>
23 #include <linux/etherdevice.h>
24 -#include <linux/platform_device.h>
25 -#include <linux/skbuff.h>
26 +#include <linux/if_vlan.h>
27 #include <linux/inetdevice.h>
28 -#include <linux/mbus.h>
29 -#include <linux/module.h>
30 #include <linux/interrupt.h>
31 -#include <linux/if_vlan.h>
32 -#include <net/ip.h>
33 -#include <net/ipv6.h>
34 #include <linux/io.h>
35 -#include <net/tso.h>
36 +#include <linux/kernel.h>
37 +#include <linux/mbus.h>
38 +#include <linux/module.h>
39 +#include <linux/netdevice.h>
40 #include <linux/of.h>
41 +#include <linux/of_address.h>
42 #include <linux/of_irq.h>
43 #include <linux/of_mdio.h>
44 #include <linux/of_net.h>
45 -#include <linux/of_address.h>
46 #include <linux/phy.h>
47 -#include <linux/clk.h>
48 -#include <linux/cpu.h>
49 +#include <linux/platform_device.h>
50 +#include <linux/skbuff.h>
51 +#include <net/ip.h>
52 +#include <net/ipv6.h>
53 +#include <net/tso.h>
54
55 /* Registers */
56 #define MVNETA_RXQ_CONFIG_REG(q) (0x1400 + ((q) << 2))