From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Jan 2009 02:58:06 +0000 (-0800)
Subject: Merge branch 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Tag: v2.6.29-rc1~497
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=c58bd34d00e04df9a0691732086cf8102b20d907

Merge branch 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux

* 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-omap: fix type of irq handler function
  i2c-s3c2410: Change IRQ to be plain integer.
  i2c-s3c2410: Allow more than one i2c-s3c2410 adapter
  i2c-s3c2410: Remove default platform data.
  i2c-s3c2410: Use platform data for gpio configuration
  i2c-s3c2410: Fixup style problems from checkpatch.pl
  i2c-omap: Enable I2C wakeups for 34xx
  i2c-omap: reprogram OCP_SYSCONFIG register after reset
  i2c-omap: convert 'rev1' flag to generic 'rev' u8
  i2c-omap: fix I2C timeouts due to recursive omap_i2c_{un,}idle()
  i2c-omap: Clean-up i2c-omap
  i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
  i2c-omap: Mark init-only functions as __init
  i2c-omap: Add support for omap34xx
  i2c-omap: FIFO handling support and broken hw workaround for i2c-omap
  i2c-omap: Add high-speed support to omap-i2c
  i2c-omap: Close suspected race between omap_i2c_idle() and omap_i2c_isr()
  i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msg

Fix up apparently-trivial conflict in drivers/i2c/busses/i2c-s3c2410.c
---

c58bd34d00e04df9a0691732086cf8102b20d907
diff --cc drivers/i2c/busses/i2c-s3c2410.c
index c39079f9c73f,2a0de645ccf3..f69f91ffb469
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@@ -38,10 -38,8 +38,8 @@@
  #include <asm/irq.h>
  #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 */