fix duplicate includes of device.h

3 files changed, 28 insertions, 36 deletions

diff --git a/13-power-qe_ic.patch b/13-power-qe_ic.patch
index 0f36457..15a658a 100644
--- a/13-power-qe_ic.patch
+++ b/13-power-qe_ic.patch
@@ -6,21 +6,20 @@ sysdev implementation will be entirely removed from the kernel.
 
 Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 ---
- arch/powerpc/sysdev/qe_lib/qe_ic.c |   13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ arch/powerpc/sysdev/qe_lib/qe_ic.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
 +++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
  #include <linux/stddef.h>
  #include <linux/sched.h>
  #include <linux/signal.h>
 -#include <linux/sysdev.h>
-+#include <linux/device.h>
  #include <linux/device.h>
  #include <linux/bootmem.h>
  #include <linux/spinlock.h>
-@@ -484,13 +484,14 @@ int qe_ic_set_high_priority(unsigned int
+@@ -484,13 +483,14 @@ int qe_ic_set_high_priority(unsigned int
  	return 0;
  }
  
@@ -38,7 +37,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  };
  
  static int __init init_qe_ic_sysfs(void)
-@@ -499,12 +500,12 @@ static int __init init_qe_ic_sysfs(void)
+@@ -499,12 +499,12 @@ static int __init init_qe_ic_sysfs(void)
  
  	printk(KERN_DEBUG "Registering qe_ic with sysfs...\n");
  
diff --git a/20-arm.patch b/20-arm.patch
index 22f9686..e91a222 100644
--- a/20-arm.patch
+++ b/20-arm.patch
@@ -17,15 +17,15 @@
  arch/arm/mach-s3c2416/irq.c                      |   10 ++++----
  arch/arm/mach-s3c2416/pm.c                       |   10 ++++----
  arch/arm/mach-s3c2416/s3c2416.c                  |   15 ++++++------
- arch/arm/mach-s3c2440/clock.c                    |   14 ++++++-----
+ arch/arm/mach-s3c2440/clock.c                    |   13 +++++-----
  arch/arm/mach-s3c2440/dma.c                      |   10 ++++----
  arch/arm/mach-s3c2440/irq.c                      |   10 ++++----
  arch/arm/mach-s3c2440/s3c2440-cpufreq.c          |   18 ++++++++------
  arch/arm/mach-s3c2440/s3c2440-pll-12000000.c     |   16 ++++++++-----
  arch/arm/mach-s3c2440/s3c2440-pll-16934400.c     |   20 ++++++++--------
  arch/arm/mach-s3c2440/s3c2440.c                  |    8 +++---
- arch/arm/mach-s3c2440/s3c2442.c                  |   16 +++++++------
- arch/arm/mach-s3c2440/s3c244x-clock.c            |   16 ++++++++-----
+ arch/arm/mach-s3c2440/s3c2442.c                  |   15 ++++++------
+ arch/arm/mach-s3c2440/s3c244x-clock.c            |   15 +++++++-----
  arch/arm/mach-s3c2440/s3c244x-irq.c              |   16 ++++++++-----
  arch/arm/mach-s3c2440/s3c244x.c                  |   16 +++++++------
  arch/arm/mach-s3c2443/dma.c                      |   10 ++++----
@@ -43,7 +43,7 @@
  arch/arm/plat-samsung/include/plat/cpu.h         |   26 ++++++++++-----------
  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h |    2 -
  arch/arm/plat-samsung/include/plat/pm.h          |    2 -
- 44 files changed, 345 insertions(+), 266 deletions(-)
+ 44 files changed, 342 insertions(+), 266 deletions(-)
 
 --- a/arch/arm/include/asm/mach/time.h
 +++ b/arch/arm/include/asm/mach/time.h
@@ -890,16 +890,15 @@
  core_initcall(s3c2416_core_init);
 --- a/arch/arm/mach-s3c2440/clock.c
 +++ b/arch/arm/mach-s3c2440/clock.c
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,6 @@
  #include <linux/errno.h>
  #include <linux/err.h>
  #include <linux/device.h>
 -#include <linux/sysdev.h>
-+#include <linux/device.h>
  #include <linux/interrupt.h>
  #include <linux/ioport.h>
  #include <linux/mutex.h>
-@@ -108,7 +108,7 @@ static struct clk s3c2440_clk_ac97 = {
+@@ -108,7 +107,7 @@ static struct clk s3c2440_clk_ac97 = {
  	.ctrlbit	= S3C2440_CLKCON_CAMERA,
  };
  
@@ -908,7 +907,7 @@
  {
  	struct clk *clock_upll;
  	struct clk *clock_h;
-@@ -137,13 +137,15 @@ static int s3c2440_clk_add(struct sys_de
+@@ -137,13 +136,15 @@ static int s3c2440_clk_add(struct sys_de
  	return 0;
  }
  
@@ -1203,16 +1202,15 @@
  void __init s3c2440_map_io(void)
 --- a/arch/arm/mach-s3c2440/s3c2442.c
 +++ b/arch/arm/mach-s3c2440/s3c2442.c
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,6 @@
  #include <linux/errno.h>
  #include <linux/err.h>
  #include <linux/device.h>
 -#include <linux/sysdev.h>
-+#include <linux/device.h>
  #include <linux/syscore_ops.h>
  #include <linux/interrupt.h>
  #include <linux/ioport.h>
-@@ -123,7 +123,7 @@ static struct clk s3c2442_clk_cam_upll =
+@@ -123,7 +122,7 @@ static struct clk s3c2442_clk_cam_upll =
  	},
  };
  
@@ -1221,7 +1219,7 @@
  {
  	struct clk *clock_upll;
  	struct clk *clock_h;
-@@ -149,20 +149,22 @@ static int s3c2442_clk_add(struct sys_de
+@@ -149,20 +148,22 @@ static int s3c2442_clk_add(struct sys_de
  	return 0;
  }
  
@@ -1248,7 +1246,7 @@
  };
  
  int __init s3c2442_init(void)
-@@ -175,7 +177,7 @@ int __init s3c2442_init(void)
+@@ -175,7 +176,7 @@ int __init s3c2442_init(void)
  	register_syscore_ops(&s3c244x_pm_syscore_ops);
  	register_syscore_ops(&s3c24xx_irq_syscore_ops);
  
@@ -1259,16 +1257,15 @@
  void __init s3c2442_map_io(void)
 --- a/arch/arm/mach-s3c2440/s3c244x-clock.c
 +++ b/arch/arm/mach-s3c2440/s3c244x-clock.c
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,6 @@
  #include <linux/errno.h>
  #include <linux/err.h>
  #include <linux/device.h>
 -#include <linux/sysdev.h>
-+#include <linux/device.h>
  #include <linux/interrupt.h>
  #include <linux/ioport.h>
  #include <linux/clk.h>
-@@ -73,7 +73,7 @@ static struct clk clk_arm = {
+@@ -73,7 +72,7 @@ static struct clk clk_arm = {
  	},
  };
  
@@ -1277,7 +1274,7 @@
  {
  	unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);
  	unsigned long clkdivn;
-@@ -115,24 +115,28 @@ static int s3c244x_clk_add(struct sys_de
+@@ -115,24 +114,28 @@ static int s3c244x_clk_add(struct sys_de
  	return 0;
  }
  
diff --git a/99-core-remove.patch b/99-core-remove.patch
index c321777..ee5eac1 100644
--- a/99-core-remove.patch
+++ b/99-core-remove.patch
@@ -7,7 +7,7 @@ like everything else in the system.
 
 Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 ---
- arch/arm/mach-bcmring/core.c                 |    2 
+ arch/arm/mach-bcmring/core.c                 |    1 
  arch/arm/mach-exynos/irq-eint.c              |    2 
  arch/arm/mach-integrator/integrator_cp.c     |    2 
  arch/arm/mach-ks8695/irq.c                   |    2 
@@ -33,9 +33,9 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  arch/arm/mach-s5pv210/clock.c                |    2 
  arch/arm/mach-s5pv210/mach-smdkc110.c        |    2 
  arch/arm/mach-s5pv210/mach-smdkv210.c        |    2 
- arch/arm/mach-versatile/core.c               |    2 
- arch/arm/mach-versatile/versatile_ab.c       |    2 
- arch/arm/mach-versatile/versatile_pb.c       |    2 
+ arch/arm/mach-versatile/core.c               |    1 
+ arch/arm/mach-versatile/versatile_ab.c       |    1 
+ arch/arm/mach-versatile/versatile_pb.c       |    1 
  arch/arm/mach-vexpress/v2m.c                 |    2 
  arch/arm/mach-w90x900/irq.c                  |    2 
  arch/arm/plat-s3c24xx/common-smdk.c          |    2 
@@ -76,16 +76,15 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  include/linux/sysdev.h                       |  164 -----------
  kernel/time/clockevents.c                    |    1 
  lib/kobject.c                                |   37 --
- 69 files changed, 54 insertions(+), 654 deletions(-)
+ 69 files changed, 50 insertions(+), 654 deletions(-)
 
 --- a/arch/arm/mach-bcmring/core.c
 +++ b/arch/arm/mach-bcmring/core.c
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,6 @@
  #include <linux/device.h>
  #include <linux/dma-mapping.h>
  #include <linux/platform_device.h>
 -#include <linux/sysdev.h>
-+#include <linux/device.h>
  #include <linux/interrupt.h>
  #include <linux/amba/bus.h>
  #include <linux/clkdev.h>
@@ -366,34 +365,31 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  #include <linux/gpio.h>
 --- a/arch/arm/mach-versatile/core.c
 +++ b/arch/arm/mach-versatile/core.c
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,6 @@
  #include <linux/device.h>
  #include <linux/dma-mapping.h>
  #include <linux/platform_device.h>
 -#include <linux/sysdev.h>
-+#include <linux/device.h>
  #include <linux/interrupt.h>
  #include <linux/irqdomain.h>
  #include <linux/of_address.h>
 --- a/arch/arm/mach-versatile/versatile_ab.c
 +++ b/arch/arm/mach-versatile/versatile_ab.c
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,6 @@
  
  #include <linux/init.h>
  #include <linux/device.h>
 -#include <linux/sysdev.h>
-+#include <linux/device.h>
  #include <linux/amba/bus.h>
  #include <linux/io.h>
  
 --- a/arch/arm/mach-versatile/versatile_pb.c
 +++ b/arch/arm/mach-versatile/versatile_pb.c
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,6 @@
  
  #include <linux/init.h>
  #include <linux/device.h>
 -#include <linux/sysdev.h>
-+#include <linux/device.h>
  #include <linux/amba/bus.h>
  #include <linux/amba/pl061.h>
  #include <linux/amba/mmci.h>