Drop duplicate header gpio.h from dsmg600-setup.c.
Signed-off-by: Geliang Tang <[email protected]>
---
arch/arm/mach-ixp4xx/dsmg600-setup.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 43ee06d..b3bd0e1 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -26,7 +26,6 @@
#include <linux/reboot.h>
#include <linux/i2c.h>
#include <linux/i2c-gpio.h>
-#include <linux/gpio.h>
#include <mach/hardware.h>
--
2.9.3
Drop duplicate header device.h from phy3250.c.
Signed-off-by: Geliang Tang <[email protected]>
---
arch/arm/mach-lpc32xx/phy3250.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index 0e4cbbe..6c52bd3 100644
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -23,7 +23,6 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/dma-mapping.h>
-#include <linux/device.h>
#include <linux/gpio.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
--
2.9.3
Drop duplicate header seq_file.h from irqchip.c.
Signed-off-by: Geliang Tang <[email protected]>
---
arch/blackfin/kernel/irqchip.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index 052cde5..39a5a7d 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -11,7 +11,6 @@
#include <linux/kallsyms.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
-#include <linux/seq_file.h>
#include <asm/irq_handler.h>
#include <asm/trace.h>
#include <asm/pda.h>
--
2.9.3
Drop duplicate header timer.h from segment.c.
Signed-off-by: Geliang Tang <[email protected]>
---
fs/f2fs/segment.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 82c3ac4..98e5be4 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -16,7 +16,6 @@
#include <linux/kthread.h>
#include <linux/swap.h>
#include <linux/timer.h>
-#include <linux/timer.h>
#include "f2fs.h"
#include "segment.h"
--
2.9.3
Drop duplicate header asm/iommu.h from book3s_64_vio_hv.c.
Signed-off-by: Geliang Tang <[email protected]>
---
arch/powerpc/kvm/book3s_64_vio_hv.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c
index d461c44..e4c4ea9 100644
--- a/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
@@ -39,7 +39,6 @@
#include <asm/udbg.h>
#include <asm/iommu.h>
#include <asm/tce.h>
-#include <asm/iommu.h>
#define TCES_PER_PAGE (PAGE_SIZE / sizeof(u64))
--
2.9.3
Drop duplicate header scatterlist.h from skd_main.c.
Signed-off-by: Geliang Tang <[email protected]>
---
drivers/block/skd_main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index 1e536b9..abf805e 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -36,7 +36,6 @@
#include <linux/scatterlist.h>
#include <linux/version.h>
#include <linux/err.h>
-#include <linux/scatterlist.h>
#include <linux/aer.h>
#include <linux/ctype.h>
#include <linux/wait.h>
--
2.9.3
Drop duplicate header scatterlist.h from iommu_common.h.
Signed-off-by: Geliang Tang <[email protected]>
---
arch/sparc/kernel/iommu_common.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/sparc/kernel/iommu_common.h b/arch/sparc/kernel/iommu_common.h
index b40cec2..8284933 100644
--- a/arch/sparc/kernel/iommu_common.h
+++ b/arch/sparc/kernel/iommu_common.h
@@ -13,7 +13,6 @@
#include <linux/scatterlist.h>
#include <linux/device.h>
#include <linux/iommu-helper.h>
-#include <linux/scatterlist.h>
#include <asm/iommu.h>
--
2.9.3
Drop duplicate header irq.h from irq.c.
Signed-off-by: Geliang Tang <[email protected]>
---
arch/sh/boards/mach-dreamcast/irq.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/sh/boards/mach-dreamcast/irq.c b/arch/sh/boards/mach-dreamcast/irq.c
index 2789647..69fa91c 100644
--- a/arch/sh/boards/mach-dreamcast/irq.c
+++ b/arch/sh/boards/mach-dreamcast/irq.c
@@ -10,7 +10,6 @@
*/
#include <linux/irq.h>
#include <linux/io.h>
-#include <linux/irq.h>
#include <linux/export.h>
#include <linux/err.h>
#include <mach/sysasic.h>
--
2.9.3
On 11/18/2016 07:21 AM, Geliang Tang wrote:
> Drop duplicate header scatterlist.h from skd_main.c.
Applied, thanks.
--
Jens Axboe
From: Geliang Tang <[email protected]>
Date: Fri, 18 Nov 2016 22:21:17 +0800
> Drop duplicate header scatterlist.h from iommu_common.h.
>
> Signed-off-by: Geliang Tang <[email protected]>
Applied, thanks.
On Fri, 2016-11-18 at 22:21 +0800, Geliang Tang wrote:
> Drop duplicate header device.h from phy3250.c.
>
> Signed-off-by: Geliang Tang <[email protected]>
> ---
> arch/arm/mach-lpc32xx/phy3250.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
> index 0e4cbbe..6c52bd3 100644
> --- a/arch/arm/mach-lpc32xx/phy3250.c
> +++ b/arch/arm/mach-lpc32xx/phy3250.c
> @@ -23,7 +23,6 @@
> #include <linux/interrupt.h>
> #include <linux/irq.h>
> #include <linux/dma-mapping.h>
> -#include <linux/device.h>
> #include <linux/gpio.h>
> #include <linux/amba/bus.h>
> #include <linux/amba/clcd.h>
Reviewed-by: Sylvain Lemieux <[email protected]>
On Friday, November 18, 2016 10:21:10 PM CET Geliang Tang wrote:
> Drop duplicate header gpio.h from dsmg600-setup.c.
>
> Signed-off-by: Geliang Tang <[email protected]>
>
Applied to arm-soc/next/fixes-non-critical, thanks
Arnd
On Monday, November 21, 2016 3:59:05 PM CET Sylvain Lemieux wrote:
> On Fri, 2016-11-18 at 22:21 +0800, Geliang Tang wrote:
> > Drop duplicate header device.h from phy3250.c.
> >
> > Signed-off-by: Geliang Tang <[email protected]>
> Reviewed-by: Sylvain Lemieux <[email protected]>
>
Applied into arm-soc/next/fixes-non-critical, I see we already merged
your other pull requests, so it seems appropriate to take this
trivial change directly.
Arnd