043-net-mvneta-sort-the-headers-in-alphabetic-order.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  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. Sorting the headers in alphabetic order will help to reduce the conflict
  5. when adding new headers in the future.
  6. Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
  7. Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  8. Signed-off-by: David S. Miller <davem@davemloft.net>
  9. ---
  10. --- a/drivers/net/ethernet/marvell/mvneta.c
  11. +++ b/drivers/net/ethernet/marvell/mvneta.c
  12. @@ -11,28 +11,28 @@
  13. * warranty of any kind, whether express or implied.
  14. */
  15. -#include <linux/kernel.h>
  16. -#include <linux/netdevice.h>
  17. +#include <linux/clk.h>
  18. +#include <linux/cpu.h>
  19. #include <linux/etherdevice.h>
  20. -#include <linux/platform_device.h>
  21. -#include <linux/skbuff.h>
  22. +#include <linux/if_vlan.h>
  23. #include <linux/inetdevice.h>
  24. -#include <linux/mbus.h>
  25. -#include <linux/module.h>
  26. #include <linux/interrupt.h>
  27. -#include <linux/if_vlan.h>
  28. -#include <net/ip.h>
  29. -#include <net/ipv6.h>
  30. #include <linux/io.h>
  31. -#include <net/tso.h>
  32. +#include <linux/kernel.h>
  33. +#include <linux/mbus.h>
  34. +#include <linux/module.h>
  35. +#include <linux/netdevice.h>
  36. #include <linux/of.h>
  37. +#include <linux/of_address.h>
  38. #include <linux/of_irq.h>
  39. #include <linux/of_mdio.h>
  40. #include <linux/of_net.h>
  41. -#include <linux/of_address.h>
  42. #include <linux/phy.h>
  43. -#include <linux/clk.h>
  44. -#include <linux/cpu.h>
  45. +#include <linux/platform_device.h>
  46. +#include <linux/skbuff.h>
  47. +#include <net/ip.h>
  48. +#include <net/ipv6.h>
  49. +#include <net/tso.h>
  50. /* Registers */
  51. #define MVNETA_RXQ_CONFIG_REG(q) (0x1400 + ((q) << 2))