fix typos

3 files changed, 152 insertions, 115 deletions

diff --git a/09-cpu.patch b/09-cpu.patch
index b9cd902..353eb12 100644
--- a/09-cpu.patch
+++ b/09-cpu.patch
@@ -2050,8 +2050,8 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 +static struct subsys_interface sq_interface = {
 +	.name		= "sq"
 +	.subsys		= &cpu_subsys,
-+	.add		= sq_dev_add,
-+	.remove		= __devexit_p(sq_dev_remove),
++	.add_dev	= sq_dev_add,
++	.remove_dev	= __devexit_p(sq_dev_remove),
  };
  
  static int __init sq_api_init(void)
diff --git a/11-s390-time.patch b/11-s390-time.patch
index a4fb148..d3855b1 100644
--- a/11-s390-time.patch
+++ b/11-s390-time.patch
@@ -42,7 +42,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 +static struct device etr_port1_dev = {
  	.id	= 1,
 -	.cls	= &etr_sysclass,
-+	.cls	= &etr_subsys,
++	.bus	= &etr_subsys,
  };
  
  /*
@@ -64,7 +64,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 -static ssize_t etr_stepping_mode_show(struct sysdev_class *class,
 -				      	struct sysdev_class_attribute *attr,
 +static ssize_t etr_stepping_mode_show(struct device *dev,
-+				      	struct device_attribute *attr,
++					struct device_attribute *attr,
  					char *buf)
  {
  	char *mode_str;
diff --git a/20-arm.patch b/20-arm.patch
index e91a222..3cba26c 100644
--- a/20-arm.patch
+++ b/20-arm.patch
@@ -1,49 +1,49 @@
 ---
  arch/arm/include/asm/mach/time.h                 |    2 -
- arch/arm/kernel/leds.c                           |   21 +++++++++--------
- arch/arm/mach-exynos/cpu.c                       |   15 ++++++------
- arch/arm/mach-exynos/pm.c                        |    8 ++++--
- arch/arm/mach-s3c2410/cpu-freq.c                 |   22 +++++++++---------
- arch/arm/mach-s3c2410/dma.c                      |   22 +++++++++++-------
- arch/arm/mach-s3c2410/include/mach/dma.h         |    4 +--
- arch/arm/mach-s3c2410/pll.c                      |   16 ++++++++-----
- arch/arm/mach-s3c2410/pm.c                       |   28 ++++++++++++++---------
- arch/arm/mach-s3c2410/s3c2410.c                  |   24 ++++++++++---------
- arch/arm/mach-s3c2412/cpu-freq.c                 |   11 ++++-----
- arch/arm/mach-s3c2412/dma.c                      |   10 ++++----
- arch/arm/mach-s3c2412/irq.c                      |   10 ++++----
- arch/arm/mach-s3c2412/pm.c                       |   10 ++++----
- arch/arm/mach-s3c2412/s3c2412.c                  |   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                    |   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                  |   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 ++++----
- arch/arm/mach-s3c2443/irq.c                      |   10 ++++----
- arch/arm/mach-s3c2443/s3c2443.c                  |   15 ++++++------
- arch/arm/mach-s3c64xx/cpu.c                      |   19 ++++++++-------
- arch/arm/mach-s3c64xx/dma.c                      |   23 +++++++++---------
- arch/arm/mach-s3c64xx/s3c6400.c                  |   15 ++++++------
- arch/arm/mach-s3c64xx/s3c6410.c                  |   15 ++++++------
- arch/arm/mach-s5p64x0/cpu.c                      |   15 ++++++------
- arch/arm/mach-s5p64x0/pm.c                       |    8 ++++--
- arch/arm/mach-s5pc100/cpu.c                      |   15 ++++++------
- arch/arm/mach-s5pv210/cpu.c                      |   15 ++++++------
- arch/arm/mach-s5pv210/pm.c                       |    8 ++++--
- arch/arm/plat-samsung/include/plat/cpu.h         |   26 ++++++++++-----------
+ arch/arm/kernel/leds.c                           |   21 +++++++------
+ arch/arm/mach-exynos/cpu.c                       |   15 +++++----
+ arch/arm/mach-exynos/pm.c                        |   10 +++---
+ arch/arm/mach-s3c2410/cpu-freq.c                 |   26 ++++++++--------
+ arch/arm/mach-s3c2410/dma.c                      |   28 ++++++++++-------
+ arch/arm/mach-s3c2410/include/mach/dma.h         |    4 +-
+ arch/arm/mach-s3c2410/pll.c                      |   20 +++++++-----
+ arch/arm/mach-s3c2410/pm.c                       |   36 ++++++++++++++---------
+ arch/arm/mach-s3c2410/s3c2410.c                  |   24 ++++++++-------
+ arch/arm/mach-s3c2412/cpu-freq.c                 |   13 ++++----
+ arch/arm/mach-s3c2412/dma.c                      |   12 ++++---
+ arch/arm/mach-s3c2412/irq.c                      |   12 ++++---
+ arch/arm/mach-s3c2412/pm.c                       |   12 ++++---
+ arch/arm/mach-s3c2412/s3c2412.c                  |   15 +++++----
+ arch/arm/mach-s3c2416/irq.c                      |   12 ++++---
+ arch/arm/mach-s3c2416/pm.c                       |   12 ++++---
+ arch/arm/mach-s3c2416/s3c2416.c                  |   15 +++++----
+ arch/arm/mach-s3c2440/clock.c                    |   15 +++++----
+ arch/arm/mach-s3c2440/dma.c                      |   12 ++++---
+ arch/arm/mach-s3c2440/irq.c                      |   12 ++++---
+ arch/arm/mach-s3c2440/s3c2440-cpufreq.c          |   22 +++++++-------
+ arch/arm/mach-s3c2440/s3c2440-pll-12000000.c     |   20 +++++++-----
+ arch/arm/mach-s3c2440/s3c2440-pll-16934400.c     |   24 +++++++--------
+ arch/arm/mach-s3c2440/s3c2440.c                  |    8 ++---
+ arch/arm/mach-s3c2440/s3c2442.c                  |   17 +++++-----
+ arch/arm/mach-s3c2440/s3c244x-clock.c            |   19 +++++++-----
+ arch/arm/mach-s3c2440/s3c244x-irq.c              |   20 +++++++-----
+ arch/arm/mach-s3c2440/s3c244x.c                  |   16 +++++-----
+ arch/arm/mach-s3c2443/dma.c                      |   12 ++++---
+ arch/arm/mach-s3c2443/irq.c                      |   12 ++++---
+ arch/arm/mach-s3c2443/s3c2443.c                  |   15 +++++----
+ arch/arm/mach-s3c64xx/cpu.c                      |   19 ++++++------
+ arch/arm/mach-s3c64xx/dma.c                      |   23 +++++++-------
+ arch/arm/mach-s3c64xx/s3c6400.c                  |   15 +++++----
+ arch/arm/mach-s3c64xx/s3c6410.c                  |   15 +++++----
+ arch/arm/mach-s5p64x0/cpu.c                      |   15 +++++----
+ arch/arm/mach-s5p64x0/pm.c                       |   10 +++---
+ arch/arm/mach-s5pc100/cpu.c                      |   15 +++++----
+ arch/arm/mach-s5pv210/cpu.c                      |   15 +++++----
+ arch/arm/mach-s5pv210/pm.c                       |   10 +++---
+ 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, 342 insertions(+), 266 deletions(-)
+ 44 files changed, 378 insertions(+), 302 deletions(-)
 
 --- a/arch/arm/include/asm/mach/time.h
 +++ b/arch/arm/include/asm/mach/time.h
@@ -167,17 +167,19 @@
  {
  	pm_cpu_prep = exynos4_pm_prepare;
  	pm_cpu_sleep = exynos4_cpu_suspend;
-@@ -301,7 +301,9 @@ static void exynos4_restore_pll(void)
+@@ -301,8 +301,10 @@ static void exynos4_restore_pll(void)
  	} while (epll_wait || vpll_wait);
  }
  
 -static struct sysdev_driver exynos4_pm_driver = {
+-	.add		= exynos4_pm_add,
 +static struct subsys_interface exynos4_pm_interface = {
 +	.name		= "exynos4_pm",
 +	.subsys		= &exynos4_subsys,
- 	.add		= exynos4_pm_add,
++	.add_dev	= exynos4_pm_add,
  };
  
+ static __init int exynos4_pm_drvinit(void)
 @@ -325,7 +327,7 @@ static __init int exynos4_pm_drvinit(voi
  		clk_put(pll_base);
  	}
@@ -209,10 +211,11 @@
  }
  
 -static struct sysdev_driver s3c2410_cpufreq_driver = {
+-	.add		= s3c2410_cpufreq_add,
 +static struct subsys_interface s3c2410_cpufreq_interface = {
 +	.name		= "s3c2410_cpufreq",
 +	.subsys		= &s3c2410_subsys,
- 	.add		= s3c2410_cpufreq_add,
++	.add_dev	= s3c2410_cpufreq_add,
  };
  
  static int __init s3c2410_cpufreq_init(void)
@@ -238,10 +241,11 @@
  }
  
 -static struct sysdev_driver s3c2410a_cpufreq_driver = {
+-	.add		= s3c2410a_cpufreq_add,
 +static struct subsys_interface s3c2410a_cpufreq_interface = {
 +	.name		= "s3c2410a_cpufreq",
 +	.subsys		= &s3c2410a_subsys,
- 	.add		= s3c2410a_cpufreq_add,
++	.add_dev	= s3c2410a_cpufreq_add,
  };
  
  static int __init s3c2410a_cpufreq_init(void)
@@ -277,10 +281,11 @@
  
  #if defined(CONFIG_CPU_S3C2410)
 -static struct sysdev_driver s3c2410_dma_driver = {
+-	.add	= s3c2410_dma_add,
 +static struct subsys_interface s3c2410_dma_interface = {
-+	.name	= "s3c2410_dma",
-+	.subsys = &s3c2410_subsys,
- 	.add	= s3c2410_dma_add,
++	.name		= "s3c2410_dma",
++	.subsys		= &s3c2410_subsys,
++	.add_dev	= s3c2410_dma_add,
  };
  
  static int __init s3c2410_dma_drvinit(void)
@@ -292,10 +297,11 @@
  arch_initcall(s3c2410_dma_drvinit);
  
 -static struct sysdev_driver s3c2410a_dma_driver = {
+-	.add	= s3c2410_dma_add,
 +static struct subsys_interface s3c2410a_dma_interface = {
-+	.name	= "s3c2410a_dma",
-+	.subsys	= &s3c2410a_subsys,
- 	.add	= s3c2410_dma_add,
++	.name		= "s3c2410a_dma",
++	.subsys		= &s3c2410a_subsys,
++	.add_dev	= s3c2410_dma_add,
  };
  
  static int __init s3c2410a_dma_drvinit(void)
@@ -310,10 +316,11 @@
  #if defined(CONFIG_CPU_S3C2442)
  /* S3C2442 DMA contains the same selection table as the S3C2410 */
 -static struct sysdev_driver s3c2442_dma_driver = {
+-	.add	= s3c2410_dma_add,
 +static struct subsys_interface s3c2442_dma_interface = {
-+	.name	= "s3c2442_dma",
-+	.subsys	= &s3c2442_subsys,
- 	.add	= s3c2410_dma_add,
++	.name		= "s3c2442_dma",
++	.subsys		= &s3c2442_subsys,
++	.add_dev	= s3c2410_dma_add,
  };
  
  static int __init s3c2442_dma_drvinit(void)
@@ -365,10 +372,11 @@
  }
  
 -static struct sysdev_driver s3c2410_plls_drv = {
+-	.add	= s3c2410_plls_add,
 +static struct subsys_interface s3c2410_plls_interface = {
-+	.name	= "s3c2410_plls",
-+	.susbys	= &s3c2410_subsys,
- 	.add	= s3c2410_plls_add,
++	.name		= "s3c2410_plls",
++	.subsys		= &s3c2410_subsys,
++	.add_dev	= s3c2410_plls_add,
  };
  
  static int __init s3c2410_pll_init(void)
@@ -381,10 +389,11 @@
  arch_initcall(s3c2410_pll_init);
  
 -static struct sysdev_driver s3c2410a_plls_drv = {
+-	.add	= s3c2410_plls_add,
 +static struct subsys_interface s3c2410a_plls_interface = {
-+	.name	= "s3c2410a_plls",
-+	.subsys	= &s3c2410a_subsys,
- 	.add	= s3c2410_plls_add,
++	.name		= "s3c2410a_plls",
++	.subsys		= &s3c2410a_subsys,
++	.add_dev	= s3c2410_plls_add,
  };
  
  static int __init s3c2410a_pll_init(void)
@@ -414,18 +423,19 @@
  {
  	pm_cpu_prep = s3c2410_pm_prepare;
  	pm_cpu_sleep = s3c2410_cpu_suspend;
-@@ -120,7 +120,9 @@ static int s3c2410_pm_add(struct sys_dev
+@@ -120,52 +120,60 @@ static int s3c2410_pm_add(struct sys_dev
  }
  
  #if defined(CONFIG_CPU_S3C2410)
 -static struct sysdev_driver s3c2410_pm_driver = {
+-	.add		= s3c2410_pm_add,
 +static struct subsys_interface s3c2410_pm_interface = {
 +	.name		= "s3c2410_pm",
 +	.subsys		= &s3c2410_subsys,
- 	.add		= s3c2410_pm_add,
++	.add_dev	= s3c2410_pm_add,
  };
  
-@@ -128,44 +130,50 @@ static struct sysdev_driver s3c2410_pm_d
+ /* register ourselves */
  
  static int __init s3c2410_pm_drvinit(void)
  {
@@ -436,10 +446,11 @@
  arch_initcall(s3c2410_pm_drvinit);
  
 -static struct sysdev_driver s3c2410a_pm_driver = {
+-	.add		= s3c2410_pm_add,
 +static struct subsys_interface s3c2410a_pm_interface = {
 +	.name		= "s3c2410a_pm",
 +	subsys		= &s3c2410a_subsys,
- 	.add		= s3c2410_pm_add,
++	.add_dev	= s3c2410_pm_add,
  };
  
  static int __init s3c2410a_pm_drvinit(void)
@@ -453,10 +464,11 @@
  
  #if defined(CONFIG_CPU_S3C2440)
 -static struct sysdev_driver s3c2440_pm_driver = {
+-	.add		= s3c2410_pm_add,
 +static struct subsys_interface s3c2440_pm_interface = {
 +	.name		= "s3c2440_pm",
 +	.subsys		= &s3c2440_subsys,
- 	.add		= s3c2410_pm_add,
++	.add_dev	= s3c2410_pm_add,
  };
  
  static int __init s3c2440_pm_drvinit(void)
@@ -470,10 +482,11 @@
  
  #if defined(CONFIG_CPU_S3C2442)
 -static struct sysdev_driver s3c2442_pm_driver = {
+-	.add		= s3c2410_pm_add,
 +static struct subsys_interface s3c2442_pm_interface = {
 +	.name		= "s3c2442_pm",
 +	.subsys		= &s3c2442_subsys,
- 	.add		= s3c2410_pm_add,
++	.add_dev	= s3c2410_pm_add,
  };
  
  static int __init s3c2442_pm_drvinit(void)
@@ -581,10 +594,11 @@
  }
  
 -static struct sysdev_driver s3c2412_cpufreq_driver = {
+-	.add		= s3c2412_cpufreq_add,
 +static struct subsys_interface s3c2412_cpufreq_interface = {
 +	.name		= "s3c2412_cpufreq",
 +	.subsys		= &s3c2412_subsys,
- 	.add		= s3c2412_cpufreq_add,
++	.add_dev	= s3c2412_cpufreq_add,
  };
  
  static int s3c2412_cpufreq_init(void)
@@ -618,10 +632,11 @@
  }
  
 -static struct sysdev_driver s3c2412_dma_driver = {
+-	.add	= s3c2412_dma_add,
 +static struct subsys_interface s3c2412_dma_interface = {
-+	.name	= "s3c2412_dma",
-+	.subsys	= &s3c2412_subsys,
- 	.add	= s3c2412_dma_add,
++	.name		= "s3c2412_dma",
++	.subsys		= &s3c2412_subsys,
++	.add_dev	= s3c2412_dma_add,
  };
  
  static int __init s3c2412_dma_init(void)
@@ -656,10 +671,11 @@
  }
  
 -static struct sysdev_driver s3c2412_irq_driver = {
+-	.add		= s3c2412_irq_add,
 +static struct subsys_interface s3c2412_irq_interface = {
 +	.name		= "s3c2412_irq",
 +	.subsys		= &s3c2412_subsys,
- 	.add		= s3c2412_irq_add,
++	.add_dev	= s3c2412_irq_add,
  };
  
  static int s3c2412_irq_init(void)
@@ -694,10 +710,11 @@
  };
  
 -static struct sysdev_driver s3c2412_pm_driver = {
+-	.add		= s3c2412_pm_add,
 +static struct subsys_interface s3c2412_pm_interface = {
 +	.name		= "s3c2412_pm",
 +	.subsys		= &s3c2412_subsys,
- 	.add		= s3c2412_pm_add,
++	.add_dev	= s3c2412_pm_add,
  };
  
  static __init int s3c2412_pm_init(void)
@@ -782,10 +799,11 @@
  }
  
 -static struct sysdev_driver s3c2416_irq_driver = {
+-	.add		= s3c2416_irq_add,
 +static struct subsys_interface s3c2416_irq_interface = {
 +	.name		= "s3c2416_irq",
 +	.subsys		= &s3c2416_subsys,
- 	.add		= s3c2416_irq_add,
++	.add_dev	= s3c2416_irq_add,
  };
  
  static int __init s3c2416_irq_init(void)
@@ -820,10 +838,11 @@
  }
  
 -static struct sysdev_driver s3c2416_pm_driver = {
+-	.add		= s3c2416_pm_add,
 +static struct subsys_interface s3c2416_pm_interface = {
 +	.name		= "s3c2416_pm",
 +	.subsys		= &s3c2416_subsys,
- 	.add		= s3c2416_pm_add,
++	.add_dev	= s3c2416_pm_add,
  };
  
  static __init int s3c2416_pm_init(void)
@@ -912,10 +931,11 @@
  }
  
 -static struct sysdev_driver s3c2440_clk_driver = {
+-	.add	= s3c2440_clk_add,
 +static struct subsys_interface s3c2440_clk_interface = {
-+	.name	= "s3c2440_clk",
-+	.subsys	= &s3c2440_subsys,
- 	.add	= s3c2440_clk_add,
++	.name		= "s3c2440_clk",
++	.subsys		= &s3c2440_subsys,
++	.add_dev	= s3c2440_clk_add,
  };
  
 -static __init int s3c24xx_clk_driver(void)
@@ -951,10 +971,11 @@
  }
  
 -static struct sysdev_driver s3c2440_dma_driver = {
+-	.add	= s3c2440_dma_add,
 +static struct subsys_interface s3c2440_dma_interface = {
-+	.name	= "s3c2440_dma",
-+	.subsys	= &s3c2440_subsys,
- 	.add	= s3c2440_dma_add,
++	.name		= "s3c2440_dma",
++	.subsys		= &s3c2440_subsys,
++	.add_dev	= s3c2440_dma_add,
  };
  
  static int __init s3c2440_dma_init(void)
@@ -989,10 +1010,11 @@
  }
  
 -static struct sysdev_driver s3c2440_irq_driver = {
+-	.add		= s3c2440_irq_add,
 +static struct subsys_interface s3c2440_irq_interface = {
 +	.name		= "s3c2440_irq",
 +	.subsys		= &s3c2440_subsys,
- 	.add		= s3c2440_irq_add,
++	.add_dev	= s3c2440_irq_add,
  };
  
  static int s3c2440_irq_init(void)
@@ -1027,10 +1049,11 @@
  }
  
 -static struct sysdev_driver s3c2440_cpufreq_driver = {
+-	.add		= s3c2440_cpufreq_add,
 +static struct subsys_interface s3c2440_cpufreq_interface = {
 +	.name		= "s3c2440_cpufreq",
 +	.subsys		= &s3c2440_subsys,
- 	.add		= s3c2440_cpufreq_add,
++	.add_dev	= s3c2440_cpufreq_add,
  };
  
  static int s3c2440_cpufreq_init(void)
@@ -1044,10 +1067,11 @@
  subsys_initcall(s3c2440_cpufreq_init);
  
 -static struct sysdev_driver s3c2442_cpufreq_driver = {
+-	.add		= s3c2440_cpufreq_add,
 +static struct subsys_interface s3c2442_cpufreq_interface = {
 +	.name		= "s3c2442_cpufreq",
 +	.subsys		= &s3c2442_subsys,
- 	.add		= s3c2440_cpufreq_add,
++	.add_dev	= s3c2440_cpufreq_add,
  };
  
  static int s3c2442_cpufreq_init(void)
@@ -1083,10 +1107,11 @@
  }
  
 -static struct sysdev_driver s3c2440_plls12_drv = {
+-	.add	= s3c2440_plls12_add,
 +static struct subsys_interface s3c2440_plls12_interface = {
-+	.name	= "s3c2440_plls12",
-+	.subsys	= &s3c2440_subsys,
- 	.add	= s3c2440_plls12_add,
++	.name		= "s3c2440_plls12",
++	.subsys		= &s3c2440_subsys,
++	.add_dev	= s3c2440_plls12_add,
  };
  
  static int __init s3c2440_pll_12mhz(void)
@@ -1099,10 +1124,11 @@
  arch_initcall(s3c2440_pll_12mhz);
  
 -static struct sysdev_driver s3c2442_plls12_drv = {
+-	.add	= s3c2440_plls12_add,
 +static struct subsys_interface s3c2442_plls12_interface = {
-+	.name	= "s3c2442_plls12",
-+	.subsys	= &s3c2442_subsys,
- 	.add	= s3c2440_plls12_add,
++	.name		= "s3c2442_plls12",
++	.subsys		= &s3c2442_subsys,
++	.add_dev	= s3c2440_plls12_add,
  };
  
  static int __init s3c2442_pll_12mhz(void)
@@ -1137,10 +1163,11 @@
  }
  
 -static struct sysdev_driver s3c2440_plls169344_drv = {
+-	.add	= s3c2440_plls169344_add,
 +static struct subsys_interface s3c2440_plls169344_interface = {
-+	.name	= "s3c2440_plls169344",
-+	.subsys	= &s3c2440_subsys,
- 	.add	= s3c2440_plls169344_add,
++	.name		= "s3c2440_plls169344",
++	.subsys		= &s3c2440_subsys,
++	.add_dev	= s3c2440_plls169344_add,
  };
  
  static int __init s3c2440_pll_16934400(void)
@@ -1154,10 +1181,11 @@
  arch_initcall(s3c2440_pll_16934400);
  
 -static struct sysdev_driver s3c2442_plls169344_drv = {
+-	.add	= s3c2440_plls169344_add,
 +static struct subsys_interface s3c2442_plls169344_interface = {
-+	.name	= "s3c2442_plls169344",
-+	.subsys	= &s3c2442_subsys,
- 	.add	= s3c2440_plls169344_add,
++	.name		= "s3c2442_plls169344",
++	.subsys		= &s3c2442_subsys,
++	.add_dev	= s3c2440_plls169344_add,
  };
  
  static int __init s3c2442_pll_16934400(void)
@@ -1224,10 +1252,11 @@
  }
  
 -static struct sysdev_driver s3c2442_clk_driver = {
+-	.add	= s3c2442_clk_add,
 +static struct subsys_interface s3c2442_clk_interface = {
-+	.name	= "s3c2442_clk",
-+	.subsys	= &s3c2442_subsys,
- 	.add	= s3c2442_clk_add,
++	.name		= "s3c2442_clk",
++	.subsys		= &s3c2442_subsys,
++	.add_dev	 s3c2442_clk_add,
  };
  
  static __init int s3c2442_clk_init(void)
@@ -1279,10 +1308,11 @@
  }
  
 -static struct sysdev_driver s3c2440_clk_driver = {
+-	.add		= s3c244x_clk_add,
 +static struct subsys_interface s3c2440_clk_interface = {
 +	.name		= "s3c2440_clk",
 +	.subsys		= &s3c2440_subsys,
- 	.add		= s3c244x_clk_add,
++	.add_dev	= s3c244x_clk_add,
  };
  
  static int s3c2440_clk_init(void)
@@ -1294,10 +1324,11 @@
  arch_initcall(s3c2440_clk_init);
  
 -static struct sysdev_driver s3c2442_clk_driver = {
+-	.add		= s3c244x_clk_add,
 +static struct subsys_interface s3c2442_clk_interface = {
 +	.name		= "s3c2442_clk",
 +	.subsys		= &s3c2442_subsys,
- 	.add		= s3c244x_clk_add,
++	.add_dev	= s3c244x_clk_add,
  };
  
  static int s3c2442_clk_init(void)
@@ -1332,10 +1363,11 @@
  }
  
 -static struct sysdev_driver s3c2440_irq_driver = {
+-	.add		= s3c244x_irq_add,
 +static struct subsys_interface s3c2440_irq_interface = {
 +	.name		= "s3c2440_irq",
 +	.subsys		= &s3c2440_subsys,
- 	.add		= s3c244x_irq_add,
++	.add_dev	= s3c244x_irq_add,
  };
  
  static int s3c2440_irq_init(void)
@@ -1347,10 +1379,11 @@
  arch_initcall(s3c2440_irq_init);
  
 -static struct sysdev_driver s3c2442_irq_driver = {
+-	.add		= s3c244x_irq_add,
 +static struct subsys_interface s3c2442_irq_interface = {
 +	.name		= "s3c2442_irq",
 +	.subsys		= &s3c2442_subsys,
- 	.add		= s3c244x_irq_add,
++	.add_dev	= s3c244x_irq_add,
  };
  
  
@@ -1436,10 +1469,11 @@
  }
  
 -static struct sysdev_driver s3c2443_dma_driver = {
+-	.add	= s3c2443_dma_add,
 +static struct subsys_interface s3c2443_dma_interface = {
-+	.name	= "s3c2443_dma",
-+	.subsys	= &s3c2443_subsys,
- 	.add	= s3c2443_dma_add,
++	.name		= "s3c2443_dma",
++	.subsys		= &s3c2443_subsys,
++	.add_dev	= s3c2443_dma_add,
  };
  
  static int __init s3c2443_dma_init(void)
@@ -1474,10 +1508,11 @@
  }
  
 -static struct sysdev_driver s3c2443_irq_driver = {
+-	.add		= s3c2443_irq_add,
 +static struct subsys_interface s3c2443_irq_interface = {
 +	.name		= "s3c2443_irq",
 +	.subsys		= &s3c2443_subsys,
- 	.add		= s3c2443_irq_add,
++	.add_dev	= s3c2443_irq_add,
  };
  
  static int __init s3c2443_irq_init(void)
@@ -1801,18 +1836,19 @@
  {
  	pm_cpu_prep = s5p64x0_pm_prepare;
  	pm_cpu_sleep = s5p64x0_cpu_suspend;
-@@ -169,7 +169,9 @@ static int s5p64x0_pm_add(struct sys_dev
+@@ -169,15 +169,17 @@ static int s5p64x0_pm_add(struct sys_dev
  	return 0;
  }
  
 -static struct sysdev_driver s5p64x0_pm_driver = {
+-	.add		= s5p64x0_pm_add,
 +static struct subsys_interface s5p64x0_pm_interface = {
 +	.name		= "s5p64x0_pm",
 +	.subsys		= &s5p64x0_subsys,
- 	.add		= s5p64x0_pm_add,
++	.add_dev	= s5p64x0_pm_add,
  };
  
-@@ -177,7 +179,7 @@ static __init int s5p64x0_pm_drvinit(voi
+ static __init int s5p64x0_pm_drvinit(void)
  {
  	s3c_pm_init();
  
@@ -1921,10 +1957,11 @@
  }
  
 -static struct sysdev_driver s5pv210_pm_driver = {
+-	.add		= s5pv210_pm_add,
 +static struct subsys_interface s5pv210_pm_interface = {
 +	.name		= "s5pv210_pm",
 +	.subsys		= &s5pv210_subsys,
- 	.add		= s5pv210_pm_add,
++	.add_dev	= s5pv210_pm_add,
  };
  
  static __init int s5pv210_pm_drvinit(void)