diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:24:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:24:57 -0400 |
| commit | 40b42f1ebf653cd72c32eb1a1a0b9fea2dfbfd7d (patch) | |
| tree | 6a2adfcd8412189932a372ce25def8611e287b5c /arch/m32r | |
| parent | 5a021e9ffd56c22700133ebc37d607f95be8f7bd (diff) | |
| parent | e24b8cb4fa2bb779bdf48656152366b6f52f748f (diff) | |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (44 commits)
i2c: Delete the i2c-isa pseudo bus driver
hwmon: refuse to load abituguru driver on non-Abit boards
hwmon: fix Abit Uguru3 driver detection on some motherboards
hwmon/w83627ehf: Be quiet when no chip is found
hwmon/w83627ehf: No need to initialize fan_min
hwmon/w83627ehf: Export the thermal sensor types
hwmon/w83627ehf: Enable VBAT monitoring
hwmon/w83627ehf: Add support for the VID inputs
hwmon/w83627ehf: Fix timing issues
hwmon/w83627ehf: Add error messages for two error cases
hwmon/w83627ehf: Convert to a platform driver
hwmon/w83627ehf: Update the Kconfig entry
make coretemp_device_remove() static
hwmon: Add LM93 support
hwmon: Improve the pwmN_enable documentation
hwmon/smsc47b397: Don't report missing fans as spinning at 82 RPM
hwmon: Add support for newer uGuru's
hwmon/f71805f: Add temperature-tracking fan control mode
hwmon/w83627ehf: Preserve speed reading when changing fan min
hwmon: fix detection of abituguru volt inputs
...
Manual fixup of trivial conflict in MAINTAINERS file
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/m32104ut/defconfig.m32104ut | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m32r/m32104ut/defconfig.m32104ut b/arch/m32r/m32104ut/defconfig.m32104ut index 7b68fe8d921e..1f88f493a9e2 100644 --- a/arch/m32r/m32104ut/defconfig.m32104ut +++ b/arch/m32r/m32104ut/defconfig.m32104ut | |||
| @@ -699,7 +699,6 @@ CONFIG_I2C_ALGOPCF=m | |||
| 699 | # I2C Hardware Bus support | 699 | # I2C Hardware Bus support |
| 700 | # | 700 | # |
| 701 | CONFIG_I2C_ELEKTOR=m | 701 | CONFIG_I2C_ELEKTOR=m |
| 702 | CONFIG_I2C_ISA=m | ||
| 703 | # CONFIG_I2C_OCORES is not set | 702 | # CONFIG_I2C_OCORES is not set |
| 704 | # CONFIG_I2C_PARPORT is not set | 703 | # CONFIG_I2C_PARPORT is not set |
| 705 | # CONFIG_I2C_PARPORT_LIGHT is not set | 704 | # CONFIG_I2C_PARPORT_LIGHT is not set |