summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-09-19 00:45:52 +0400
committerJean Delvare <khali@linux-fr.org>2009-09-19 00:45:52 +0400
commitcfd550ed3d3bd509b475c7a9d425fc63bf843a7c (patch)
treecc16daaa51a8b0365afda90da1a3709dd01cdb6b
parentdc9854212e0d7318d7133697906d98b78f3088b6 (diff)
downloadlinux-cfd550ed3d3bd509b475c7a9d425fc63bf843a7c.tar.xz
i2c: Clearly mark ACPI drivers as such
Now that we have ACPI-based SMBus controller drivers, and we will start telling users to use them instead of native drivers when I/O resources conflict, I think it would be good to clearly mark ACPI drivers as such in Kconfig. This is exactly the same as we just did for hwmon drivers. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Crane Cai <crane.cai@amd.com>
-rw-r--r--drivers/i2c/busses/Kconfig27
-rw-r--r--drivers/i2c/busses/Makefile2
2 files changed, 17 insertions, 12 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 838bd1e4efb4..6bedd2fcfc15 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -232,6 +232,22 @@ config I2C_VIAPRO
This driver can also be built as a module. If so, the module
will be called i2c-viapro.
+if ACPI
+
+comment "ACPI drivers"
+
+config I2C_SCMI
+ tristate "SMBus Control Method Interface"
+ help
+ This driver supports the SMBus Control Method Interface. It needs the
+ BIOS to declare ACPI control methods as described in the SMBus Control
+ Method Interface specification.
+
+ To compile this driver as a module, choose M here:
+ the module will be called i2c-scmi.
+
+endif # ACPI
+
comment "Mac SMBus host controller drivers"
depends on PPC_CHRP || PPC_PMAC
@@ -762,15 +778,4 @@ config SCx200_ACB
This support is also available as a module. If so, the module
will be called scx200_acb.
-config I2C_SCMI
- tristate "SMBus Control Method Interface"
- depends on ACPI
- help
- This driver supports the SMBus Control Method Interface. It needs the
- BIOS to declare ACPI control methods as described in the SMBus Control
- Method Interface specification.
-
- To compile this driver as a module, choose M here:
- the module will be called i2c-scmi.
-
endmenu
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 060da43cf7db..ff937ac69f5b 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -2,7 +2,7 @@
# Makefile for the i2c bus drivers.
#
-# SMBus CMI driver
+# ACPI drivers
obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o
# PC SMBus host controller drivers