Messages in this thread | | | Date | Wed, 15 Feb 2006 10:12:28 +0000 | From | Russell King <> | Subject | Re: [PATCH] remove duplicate #includes |
| |
On Mon, Feb 13, 2006 at 10:39:59AM +0100, Herbert Poetzl wrote: > diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop321-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop321-setup.c > --- linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop321-setup.c 2006-02-07 11:52:06 +0100 > +++ linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop321-setup.c 2006-02-13 01:14:57 +0100 > @@ -13,7 +13,6 @@ > #include <linux/mm.h> > #include <linux/init.h> > #include <linux/config.h> > -#include <linux/init.h> > #include <linux/major.h> > #include <linux/fs.h> > #include <linux/platform_device.h> > diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop331-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop331-setup.c > --- linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop331-setup.c 2006-02-07 11:52:06 +0100 > +++ linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop331-setup.c 2006-02-13 01:15:09 +0100 > @@ -12,7 +12,6 @@ > #include <linux/mm.h> > #include <linux/init.h> > #include <linux/config.h> > -#include <linux/init.h> > #include <linux/major.h> > #include <linux/fs.h> > #include <linux/platform_device.h> > diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/plat-omap/pm.c linux-2.6.16-rc2-mpf/arch/arm/plat-omap/pm.c > --- linux-2.6.16-rc2/arch/arm/plat-omap/pm.c 2006-01-03 17:29:08 +0100 > +++ linux-2.6.16-rc2-mpf/arch/arm/plat-omap/pm.c 2006-02-13 01:15:24 +0100 > @@ -38,7 +38,6 @@ > #include <linux/pm.h> > #include <linux/sched.h> > #include <linux/proc_fs.h> > -#include <linux/pm.h> > #include <linux/interrupt.h> > > #include <asm/io.h> > diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/s3c2410fb.c linux-2.6.16-rc2-mpf/drivers/video/s3c2410fb.c > --- linux-2.6.16-rc2/drivers/video/s3c2410fb.c 2006-02-07 11:52:57 +0100 > +++ linux-2.6.16-rc2-mpf/drivers/video/s3c2410fb.c 2006-02-13 01:38:19 +0100 > @@ -82,7 +82,6 @@ > #include <linux/fb.h> > #include <linux/init.h> > #include <linux/dma-mapping.h> > -#include <linux/string.h> > #include <linux/interrupt.h> > #include <linux/workqueue.h> > #include <linux/wait.h>
Thanks, I've applied just the above bits of the patch.
-- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |