kevin/linux
1
Fork 0
Code
42b2aa86c6
linux/drivers/hwmon
History
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
pmbus hwmon: (pmbus_core) Simplify sign extensions 2011-10-24 11:09:44 -07:00
abituguru3.c hwmon: (abituguru) Depend on DMI 2011-05-25 20:43:33 +02:00
abituguru.c hwmon: (abituguru) Depend on DMI 2011-05-25 20:43:33 +02:00
acpi_power_meter.c Move ACPI power meter driver to hwmon 2011-05-25 20:43:32 +02:00
ad7314.c hwmon: AD7314 driver (ported from IIO) 2011-10-24 11:09:41 -07:00
ad7414.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
ad7418.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
adcxx.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
adm1021.c
adm1025.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
adm1026.c Fix common misspellings 2011-03-31 11:26:23 -03:00
adm1029.c
adm1031.c hwmon: (adm1031) Replace update_rate sysfs attribute with update_interval 2010-09-17 17:24:14 +02:00
adm9240.c hwmon: (adm9240) Implement the standard intrusion detection interface 2011-01-12 21:55:09 +01:00
ads1015.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
ads7828.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
ads7871.c hwmon: (ads7871) Fix ads7871_probe error paths 2010-08-25 15:42:10 +02:00
adt7411.c hwmon: (adt7411) add MODULE_DEVICE_TABLE 2011-02-26 08:59:32 -08:00
adt7462.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
adt7470.c hwmon: (adt7470) Use pr_fmt and pr_<level> 2011-01-08 10:55:02 -08:00
adt7475.c hwmon: I2C addresses are constant 2010-10-28 20:31:50 +02:00
amc6821.c hwmon: Change mail address of Hans J. Koch 2010-11-15 21:38:56 +01:00
applesmc.c hwmon: (applesmc) Properly initialize lockdep attributes 2011-01-23 09:28:50 -08:00
asb100.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
asc7621.c hwmon: I2C addresses are constant 2010-10-28 20:31:50 +02:00
asus_atk0110.c hwmon: (asus_atk0110) Fix memory leak 2011-07-17 18:39:18 +02:00
atxp1.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
coretemp.c hwmon: (coretemp) Fix for non-SMP builds 2011-11-06 20:25:18 +01:00
dme1737.c hwmon: (dme1737) Minor cleanups 2011-01-12 21:55:13 +01:00
ds620.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
ds1621.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
emc6w201.c hwmon: (emc6w201) Properly handle all errors 2011-07-03 13:32:53 +02:00
emc1403.c hwmon: (emc1403) Fix I2C address range 2011-02-09 13:45:52 -08:00
emc2103.c hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controller 2010-08-14 21:08:54 +02:00
exynos4_tmu.c hwmon: (exynos4_tmu) Remove IRQF_DISABLED 2011-10-24 11:09:36 -07:00
f71805f.c hwmon: (f71805f) Use pr_fmt and pr_<level> 2011-01-08 10:55:07 -08:00
f71882fg.c hwmon/f71882fg: Make the decision wether to register fan attr. per fan 2011-10-24 11:09:38 -07:00
f75375s.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
fam15h_power.c hwmon: Add driver for AMD family 15h processor power information 2011-05-25 20:43:31 +02:00
fschmd.c hwmon: (fschmd) Drop useless mutex 2011-01-12 21:55:11 +01:00
g760a.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
gl518sm.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
gl520sm.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
gpio-fan.c drivers: Final irq namespace conversion 2011-03-29 14:48:19 +02:00
hwmon-vid.c hwmon-vid: Add support for VIA family 6 model D CPU 2011-07-25 21:46:10 +02:00
hwmon.c hwmon: convert idr to ida and use ida_simple interface 2011-10-31 17:30:51 -07:00
i5k_amb.c hwmon: (i5k_amb) Drop i5k_channel_pci_id 2011-08-23 21:04:28 -07:00
ibmaem.c hwmon: (ibmaem) Avoid repeated memory allocations 2011-11-04 12:00:46 +01:00
ibmpex.c hwmon: (ibmpex) Initialize sysfs attributes 2011-06-17 23:22:27 -07:00
it87.c hwmon: (it87) Add chassis intrusion detection support 2011-07-25 21:46:10 +02:00
jc42.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
jz4740-hwmon.c jz4740: silence warnings related to mfd_get_cell changes 2011-03-23 10:42:02 +01:00
k8temp.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
k10temp.c hwmon: (k10temp) Add support for Fam15h (Bulldozer) 2011-05-25 20:43:31 +02:00
Kconfig hwmon: (w83627ehf) Add support for the W83627UHG 2011-11-04 12:00:48 +01:00
lineage-pem.c hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes 2011-03-16 06:57:34 -07:00
lm63.c hwmon: (lm63) Consider LM64 temperature offset 2011-02-09 13:45:42 -08:00
lm70.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
lm73.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
lm75.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
lm75.h hwmon: (lm75) Add suspend/resume feature 2010-08-14 21:08:50 +02:00
lm77.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
lm78.c hwmon: (lm78) Become the maintainer 2011-07-25 21:46:11 +02:00
lm80.c
lm83.c
lm85.c hwmon: (lm85) Fix error paths in probe function 2011-04-29 16:33:36 +02:00
lm87.c
lm90.c hwmon: (lm90) Make code more readable 2011-11-04 12:00:47 +01:00
lm92.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
lm93.c hwmon: (lm93) Add support for LM94 2011-01-18 12:22:54 -08:00
lm95241.c hwmon: (lm95241) Add support for LM95231 2011-07-28 00:17:35 -07:00
lm95245.c hwmon: LM95245 driver 2011-07-28 00:17:35 -07:00
ltc4151.c hwmon: Add support for LTC4151 2011-03-14 22:39:11 -07:00
ltc4215.c hwmon: (ltc4215) make sysfs file match the alarm cause 2010-12-13 09:54:50 -08:00
ltc4245.c hwmon: (ltc4245) Expose all GPIO pins as analog voltages 2010-08-14 21:08:49 +02:00
ltc4261.c hwmon: (ltc4261) Fix error message format 2010-11-05 10:17:19 -07:00
Makefile hwmon: AD7314 driver (ported from IIO) 2011-10-24 11:09:41 -07:00
max1111.c hwmon: (max1111) Avoid extra memory allocations 2011-07-25 21:46:10 +02:00
max1619.c
max1668.c hwmon: (max1668) Add support for tempX_fault attributes 2011-07-28 00:17:33 -07:00
max6639.c hwmon: (max6639) Set reasonable default PWM frequency 2011-03-14 22:36:25 -07:00
max6642.c hwmon: (max6642): Better chip detection schema 2011-06-04 10:34:28 -07:00
max6650.c hwmon: (max6650) Properly support the MAX6650 2011-05-25 20:43:32 +02:00
max16065.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
mc13783-adc.c hwmon: Convert mc13783-adc to mc13xxx API 2011-10-24 14:09:12 +02:00
ntc_thermistor.c hwmon: (ntc_thermistor) Simplify if sequence 2011-08-22 14:04:05 -07:00
pc87360.c hwmon: (pc87360) Use pr_fmt and pr_<level> 2011-01-12 21:55:11 +01:00
pc87427.c hwmon: (pc87427) Use pr_fmt and pr_<level> 2011-01-12 21:55:11 +01:00
pcf8591.c hwmon: (pcf8591) Use pr_fmt and pr_<level> 2011-01-08 10:55:16 -08:00
s3c-hwmon.c hwmon: (s3c) Initialize sysfs attributes 2011-06-17 23:22:27 -07:00
sch56xx-common.c hwmon: New driver sch5636 2011-07-25 21:46:09 +02:00
sch56xx-common.h hwmon: (sch5627) Factor out some code shared with sch5636 driver 2011-07-25 21:46:09 +02:00
sch5627.c hwmon: (sch5627) Factor out some code shared with sch5636 driver 2011-07-25 21:46:09 +02:00
sch5636.c hwmon: New driver sch5636 2011-07-25 21:46:09 +02:00
sht15.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
sht21.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
sis5595.c hwmon: (sis5595) Use pr_fmt and pr_<level> 2011-01-08 10:55:18 -08:00
smm665.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
smsc47b397.c hwmon: (smsc47b397) Fix checkpatch errors 2011-11-04 12:00:47 +01:00
smsc47m1.c hwmon: (smsc47m1) Use pr_fmt and pr_<level> 2011-01-08 10:55:27 -08:00
smsc47m192.c
thmc50.c
tmp102.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
tmp401.c hwmon: (tmp401) Reorganize code to get rid of static forward declarations 2010-05-27 19:58:49 +02:00
tmp421.c hwmon: I2C addresses are constant 2010-10-28 20:31:50 +02:00
twl4030-madc-hwmon.c hwmon: (twl4030-madc-hwmon) Return proper error if hwmon_device_register fails 2011-05-01 09:06:35 -07:00
ultra45_env.c drivers/hwmon: add module.h to ultra45_env.c 2011-10-31 19:31:47 -04:00
via686a.c hwmon: (via686a) Initialize fan_div values 2011-01-12 21:55:09 +01:00
via-cputemp.c hwmon: (via-cputemp) Add VID reporting support 2011-07-25 21:46:10 +02:00
vt1211.c hwmon: (vt1211) Use pr_fmt and pr_<level> 2011-01-08 10:55:30 -08:00
vt8231.c hwmon: (vt8231) Use pr_fmt and pr_<level> 2011-01-08 10:55:31 -08:00
w83l785ts.c
w83l786ng.c
w83627ehf.c hwmon: (w83627ehf) Fix broken driver init 2011-11-06 20:25:18 +01:00
w83627hf.c hwmon: (w83627hf) Use pr_fmt and pr_<level> 2011-01-08 10:55:33 -08:00
w83781d.c hwmon: Use i2c_smbus_{read,write}_word_swapped 2011-11-04 12:00:47 +01:00
w83791d.c hwmon: (w83791d) rename prototype parameter from 'register' to 'reg' 2011-09-21 17:25:18 -07:00
w83792d.c Fix common misspellings 2011-03-31 11:26:23 -03:00
w83793.c Fix common misspellings 2011-03-31 11:26:23 -03:00
w83795.c hwmon: (w83795) Silent false warning from gcc 2011-01-12 21:55:09 +01:00
wm831x-hwmon.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
wm8350-hwmon.c