aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-09-18 16:45:52 -0400
committerJean Delvare <khali@linux-fr.org>2009-09-18 16:45:52 -0400
commitcfd550ed3d3bd509b475c7a9d425fc63bf843a7c (patch)
treecc16daaa51a8b0365afda90da1a3709dd01cdb6b
parentdc9854212e0d7318d7133697906d98b78f3088b6 (diff)
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
232 This driver can also be built as a module. If so, the module 232 This driver can also be built as a module. If so, the module
233 will be called i2c-viapro. 233 will be called i2c-viapro.
234 234
235if ACPI
236
237comment "ACPI drivers"
238
239config I2C_SCMI
240 tristate "SMBus Control Method Interface"
241 help
242 This driver supports the SMBus Control Method Interface. It needs the
243 BIOS to declare ACPI control methods as described in the SMBus Control
244 Method Interface specification.
245
246 To compile this driver as a module, choose M here:
247 the module will be called i2c-scmi.
248
249endif # ACPI
250
235comment "Mac SMBus host controller drivers" 251comment "Mac SMBus host controller drivers"
236 depends on PPC_CHRP || PPC_PMAC 252 depends on PPC_CHRP || PPC_PMAC
237 253
@@ -762,15 +778,4 @@ config SCx200_ACB
762 This support is also available as a module. If so, the module 778 This support is also available as a module. If so, the module
763 will be called scx200_acb. 779 will be called scx200_acb.
764 780
765config I2C_SCMI
766 tristate "SMBus Control Method Interface"
767 depends on ACPI
768 help
769 This driver supports the SMBus Control Method Interface. It needs the
770 BIOS to declare ACPI control methods as described in the SMBus Control
771 Method Interface specification.
772
773 To compile this driver as a module, choose M here:
774 the module will be called i2c-scmi.
775
776endmenu 781endmenu
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 @@
2# Makefile for the i2c bus drivers. 2# Makefile for the i2c bus drivers.
3# 3#
4 4
5# SMBus CMI driver 5# ACPI drivers
6obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o 6obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o
7 7
8# PC SMBus host controller drivers 8# PC SMBus host controller drivers