Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Apr 2006 00:08:41 +0000 (17:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Apr 2006 00:08:41 +0000 (17:08 -0700)
commit11f16971ceeb0f442e58f318b0cfde8eb35296bb
tree857d0975f65dcc81f7e0fe8ceabad183cd97e763
parentbcdc084257352902103aca85c65ddbbba8f74732
parente97b81ddbb8b8c72b85330ac4a454a4513dcba8a
Merge /pub/scm/linux/kernel/git/gregkh/i2c-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (78 commits)
  commit e97b81ddbb8b8c72b85330ac4a454a4513dcba8a
  Author: Mark M. Hoffman <mhoffman@lightlink.com>
  Date:   Thu Mar 23 16:50:25 2006 +0100

      [PATCH] i2c-parport: Make type parameter mandatory

      This patch forces the user to specify what type of adapter is present when
      loading i2c-parport or i2c-parport-light.  If none is specified, the driver
      init simply fails - instead of assuming adapter type 0.

      This alleviates the sometimes lengthy boot time delays which can be caused
      by accidentally building one of these into a kernel along with several i2c
      slave drivers that have lengthy probe routines (e.g. hwmon drivers).

      Kconfig and documentation updated accordingly.

Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  ...