[PATCH net 0/2] Fix duplicate #include headers

[PATCH net 0/2] Fix duplicate #include headers

[Jean Sacren]

This tiny series fixes the same issue of duplicate #include headers.

Jean Sacren (2):
  sxgbe: fix duplicate #include headers
  mac802154: fix duplicate #include headers

 drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c | 1 -
 net/mac802154/mib.c                            | 1 -
 2 files changed, 2 deletions(-)

[PATCH net 1/2] sxgbe: fix duplicate #include headers

[Jean Sacren]

The commit 1edb9ca69e8a ("net: sxgbe: add basic framework for
Samsung 10Gb ethernet driver") added support for Samsung 10Gb
ethernet driver(sxgbe) with a minor issue of including linux/io.h
header twice in sxgbe_dma.c file. Fix the duplicate #include by
deleting the top one so that all the rest good #include headers
would be preserved in the alphabetical order.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Cc: Byungho An <bh74.an@samsung.com>
Cc: Girish K S <ks.giri@samsung.com>
Cc: Siva Reddy Kallam <siva.kallam@samsung.com>
Cc: Vipul Pandya <vipul.pandya@samsung.com>
---
 drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c
index 28f89c41d0cd..4d989ff6c978 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c
@@ -9,7 +9,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/export.h>
 #include <linux/io.h>

[PATCH net 2/2] mac802154: fix duplicate #include headers

[Jean Sacren]

The commit e6278d92005e ("mac802154: use header operations to
create/parse headers") included the header

		net/ieee802154_netdev.h

which had been included by the commit b70ab2e87f17 ("ieee802154:
enforce consistent endianness in the 802.15.4 stack"). Fix this
duplicate #include by deleting the latter one as the required header
has already been in place.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Cc: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Cc: linux-zigbee-devel@lists.sourceforge.net
---
 net/mac802154/mib.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 153bd1ddbfbb..f0991f2344d4 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -26,7 +26,6 @@
 #include <net/mac802154.h>
 #include <net/ieee802154_netdev.h>
 #include <net/wpan-phy.h>
-#include <net/ieee802154_netdev.h>
 
 #include "mac802154.h"
 

RE: [PATCH net 1/2] sxgbe: fix duplicate #include headers

[Byungho An]

Jean Sacren wrote:
> 
> The commit 1edb9ca69e8a ("net: sxgbe: add basic framework for
> Samsung 10Gb ethernet driver") added support for Samsung 10Gb
> ethernet driver(sxgbe) with a minor issue of including linux/io.h
> header twice in sxgbe_dma.c file. Fix the duplicate #include by
> deleting the top one so that all the rest good #include headers
> would be preserved in the alphabetical order.
> 
> Signed-off-by: Jean Sacren <sakiwit@gmail.com>
> Cc: Byungho An <bh74.an@samsung.com>

Acked-by: Byungho An <bh74.an@samsung.com>

Thanks,
Byungho

> Cc: Girish K S <ks.giri@samsung.com>
> Cc: Siva Reddy Kallam <siva.kallam@samsung.com>
> Cc: Vipul Pandya <vipul.pandya@samsung.com>
> ---
>  drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c
> b/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c
> index 28f89c41d0cd..4d989ff6c978 100644
> --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c
> +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c
> @@ -9,7 +9,6 @@
>   * it under the terms of the GNU General Public License version 2 as
>   * published by the Free Software Foundation.
>   */
> -#include <linux/io.h>
>  #include <linux/delay.h>
>  #include <linux/export.h>
>  #include <linux/io.h>

Re: [PATCH net 0/2] Fix duplicate #include headers

[David Miller]

From: Jean Sacren <sakiwit@gmail.com>
Date: Sat,  5 Apr 2014 00:28:59 -0600

> This tiny series fixes the same issue of duplicate #include headers.
> 
> Jean Sacren (2):
>   sxgbe: fix duplicate #include headers
>   mac802154: fix duplicate #include headers

Both applied, thanks.