From a1149ef09ba9634a5ea656e3e93d321c792efde2 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 10 Aug 2008 22:56:15 +0200
Subject: [PATCH] --- yaml --- r: 108144 b: refs/heads/master c:
 8d24f8dcb7ead491704e274883b2c627062f6235 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/i2c/Kconfig       | 14 ++++++++++++++
 trunk/drivers/i2c/algos/Kconfig | 11 ++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9fd402ee1d2b..449cbfa74b9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b25b791b13aaa336b56c4f9bd417ff126363f80b
+refs/heads/master: 8d24f8dcb7ead491704e274883b2c627062f6235
diff --git a/trunk/drivers/i2c/Kconfig b/trunk/drivers/i2c/Kconfig
index 96867347bcbf..711ca08ab776 100644
--- a/trunk/drivers/i2c/Kconfig
+++ b/trunk/drivers/i2c/Kconfig
@@ -38,6 +38,20 @@ config I2C_CHARDEV
 	  This support is also available as a module.  If so, the module 
 	  will be called i2c-dev.
 
+config I2C_HELPER_AUTO
+	bool "Autoselect pertinent helper modules"
+	default y
+	help
+	  Some I2C bus drivers require so-called "I2C algorithm" modules
+	  to work. These are basically software-only abstractions of generic
+	  I2C interfaces. This option will autoselect them so that you don't
+	  have to care.
+
+	  Unselect this only if you need to enable additional helper
+	  modules, for example for use with external I2C bus drivers.
+
+	  In doubt, say Y.
+
 source drivers/i2c/algos/Kconfig
 source drivers/i2c/busses/Kconfig
 source drivers/i2c/chips/Kconfig
diff --git a/trunk/drivers/i2c/algos/Kconfig b/trunk/drivers/i2c/algos/Kconfig
index 7137a17402fe..b788579b8227 100644
--- a/trunk/drivers/i2c/algos/Kconfig
+++ b/trunk/drivers/i2c/algos/Kconfig
@@ -2,15 +2,20 @@
 # I2C algorithm drivers configuration
 #
 
+menu "I2C Algorithms"
+	depends on !I2C_HELPER_AUTO
+
 config I2C_ALGOBIT
-	tristate
+	tristate "I2C bit-banging interfaces"
 
 config I2C_ALGOPCF
-	tristate
+	tristate "I2C PCF 8584 interfaces"
 
 config I2C_ALGOPCA
-	tristate
+	tristate "I2C PCA 9564 interfaces"
 
 config I2C_ALGO_SGI
 	tristate
 	depends on SGI_IP22 || SGI_IP32 || X86_VISWS
+
+endmenu