diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-11 11:23:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-11 11:23:33 -0700 |
| commit | 4c274fff4fa03cf2509e1b01d3712de6131bfa50 (patch) | |
| tree | 7a1c32af08c3eb559154f2340431b8de178b167b /drivers/hwmon/Kconfig | |
| parent | 474a503d4bf77ae0cbe484dd0842a2648c0b1c28 (diff) | |
| parent | 384e724b6b396de32c1e9cb0b7ccdd011bcc2beb (diff) | |
| download | op-kernel-dev-4c274fff4fa03cf2509e1b01d3712de6131bfa50.zip op-kernel-dev-4c274fff4fa03cf2509e1b01d3712de6131bfa50.tar.gz | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (s3c-hwmon) Disable build for S3C64xx
MAINTAINERS: Fix Riku Voipio's address
hwmon: (asus_atk0110) Enable the EC
hwmon: (asus_atk0110) Refactor the code
hwmon: (sht15) Fix spurious section mismatch warning
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 6857560..700e93a 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -675,7 +675,7 @@ config SENSORS_SHT15 config SENSORS_S3C tristate "S3C24XX/S3C64XX Inbuilt ADC" - depends on ARCH_S3C2410 || ARCH_S3C64XX + depends on ARCH_S3C2410 help If you say yes here you get support for the on-board ADCs of the Samsung S3C24XX or S3C64XX series of SoC |
