• Linus Torvalds's avatar
    Merge branch 'i2c-next' of git://aeryn.fluff.org.uk/bjdooks/linux · c58bd34d
    Linus Torvalds authored
    * '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
    c58bd34d
i2c-s3c2410.c 22.3 KB