Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

diff --combined drivers/i2c/busses/i2c-s3c2410.c
index 4ad9c47,1fac4e2..fdebd93
--- 1/drivers/i2c/busses/i2c-s3c2410.c
--- 2/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@@ -40,8 -40,8 +40,8 @@@
  #include <asm/io.h>
  
  #include <mach/regs-gpio.h>
 -#include <asm/plat-s3c/regs-iic.h>
 -#include <asm/plat-s3c/iic.h>
 +#include <plat/regs-iic.h>
 +#include <plat/iic.h>
  
  /* i2c controller state */
  
@@@ -507,7 -507,7 +507,7 @@@ static int s3c24xx_i2c_doxfer(struct s3
        unsigned long timeout;
        int ret;
  
-       if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)
+       if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
                return -EIO;
  
        ret = s3c24xx_i2c_set_master(i2c);

diff --combined drivers/rtc/rtc-s3c.c
index 0273ebc,f59277b..7a568be
--- 1/drivers/rtc/rtc-s3c.c
--- 2/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@@ -26,7 -26,7 +26,7 @@@
  #include <asm/uaccess.h>
  #include <asm/io.h>
  #include <asm/irq.h>
 -#include <asm/plat-s3c/regs-rtc.h>
 +#include <plat/regs-rtc.h>
  
  /* I have yet to find an S3C implementation with more than one
   * of these rtc blocks in */
@@@ -455,6 -455,8 +455,8 @@@ static int __devinit s3c_rtc_probe(stru
  
        s3c_rtc_setfreq(&pdev->dev, 1);
  
+       device_init_wakeup(&pdev->dev, 1);
+ 
        /* register RTC and exit */
  
        rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops,
@@@ -507,7 -509,7 +509,7 @@@ static int s3c_rtc_resume(struct platfo
  #define s3c_rtc_resume  NULL
  #endif
  
- static struct platform_driver s3c2410_rtcdrv = {
+ static struct platform_driver s3c2410_rtc_driver = {
        .probe          = s3c_rtc_probe,
        .remove         = __devexit_p(s3c_rtc_remove),
        .suspend        = s3c_rtc_suspend,
@@@ -523,12 -525,12 +525,12 @@@ static char __initdata banner[] = "S3C2
  static int __init s3c_rtc_init(void)
  {
        printk(banner);
-       return platform_driver_register(&s3c2410_rtcdrv);
+       return platform_driver_register(&s3c2410_rtc_driver);
  }
  
  static void __exit s3c_rtc_exit(void)
  {
-       platform_driver_unregister(&s3c2410_rtcdrv);
+       platform_driver_unregister(&s3c2410_rtc_driver);
  }
  
  module_init(s3c_rtc_init);

diff --combined drivers/watchdog/s3c2410_wdt.c
index 13a4b17,f7f6ce8..e31925e
--- 1/drivers/watchdog/s3c2410_wdt.c
--- 2/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@@ -6,7 -6,7 +6,7 @@@
   * S3C2410 Watchdog Timer Support
   *
   * Based on, softdog.c by Alan Cox,
-  *     (c) Copyright 1996 Alan Cox <alan@redhat.com>
+  *     (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@@ -42,7 -42,7 +42,7 @@@
  #undef S3C_VA_WATCHDOG
  #define S3C_VA_WATCHDOG (0)
  
 -#include <asm/plat-s3c/regs-watchdog.h>
 +#include <plat/regs-watchdog.h>
  
  #define PFX "s3c2410-wdt: "