diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /drivers/hwmon/Kconfig | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 89765dd9aadf..ebacc0af40fe 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
| @@ -540,6 +540,15 @@ config SENSORS_LM93 | |||
| 540 | This driver can also be built as a module. If so, the module | 540 | This driver can also be built as a module. If so, the module |
| 541 | will be called lm93. | 541 | will be called lm93. |
| 542 | 542 | ||
| 543 | config SENSORS_MAX1111 | ||
| 544 | tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip" | ||
| 545 | depends on SPI_MASTER | ||
| 546 | help | ||
| 547 | Say y here to support Maxim's MAX1111 ADC chips. | ||
| 548 | |||
| 549 | This driver can also be built as a module. If so, the module | ||
| 550 | will be called max1111. | ||
| 551 | |||
| 543 | config SENSORS_MAX1619 | 552 | config SENSORS_MAX1619 |
| 544 | tristate "Maxim MAX1619 sensor chip" | 553 | tristate "Maxim MAX1619 sensor chip" |
| 545 | depends on I2C | 554 | depends on I2C |