OpenCloudOS-Kernel/drivers/hwmon
Linus Torvalds 7cc4e87f91 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.
2008-10-11 10:09:45 -07:00
..
ams hwmon: Use linux/of_platform.h instead of asm 2008-06-30 22:30:31 +10:00
Kconfig hwmon: add max1111 Low-power Multichannel Serial 8-bit ADCs 2008-09-23 22:04:32 +01:00
Makefile hwmon: add max1111 Low-power Multichannel Serial 8-bit ADCs 2008-09-23 22:04:32 +01:00
abituguru.c Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 2007-10-14 12:50:19 -07:00
abituguru3.c hwmon: (abituguru3) Enable DMI probing feature on Abit AT8 32X 2008-10-09 15:33:59 +02:00
ad7414.c hwmon: (ad7414) Make ad7414_update_device() static 2008-09-20 10:25:20 +02:00
ad7418.c hwmon: (ad7418) Convert to a new-style i2c driver 2008-07-16 19:30:08 +02:00
adcxx.c hwmon: ADC124S501 generic driver 2008-08-15 08:35:43 -07:00
adm1021.c hwmon: (adm1021) Convert to a new-style i2c driver 2008-07-16 19:30:08 +02:00
adm1025.c hwmon: (adm1025) Convert to a new-style i2c driver 2008-07-16 19:30:08 +02:00
adm1026.c hwmon: (adm1026) Convert to a new-style i2c driver 2008-07-16 19:30:08 +02:00
adm1029.c hwmon: (adm1029) Convert to a new-style i2c driver 2008-07-16 19:30:09 +02:00
adm1031.c hwmon: (adm1031) Convert to a new-style i2c driver 2008-07-16 19:30:09 +02:00
adm9240.c hwmon: (adm9240) Convert to a new-style i2c driver 2008-07-16 19:30:09 +02:00
ads7828.c hwmon: (ads7828) Convert to a new-style i2c driver 2008-07-16 19:30:10 +02:00
adt7470.c hwmon: (adt7470) Convert to a new-style i2c driver 2008-07-16 19:30:10 +02:00
adt7473.c Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 2008-08-01 11:33:19 -07:00
applesmc.c applesmc: add support for Macbook 2008-08-15 08:35:43 -07:00
asb100.c hwmon: (asb100) Convert to a new-style i2c driver 2008-07-16 19:30:11 +02:00
atxp1.c hwmon: (atxp1) Fix device detection logic 2008-09-20 10:25:19 +02:00
coretemp.c coretemp: recognize Nehalem CPUs 2008-08-15 08:35:44 -07:00
dme1737.c hwmon: (dme1737) Add support for the SMSC SCH5027 2008-08-06 22:41:03 +02:00
ds1621.c hwmon: (ds1621) Convert to a new-style i2c driver 2008-07-16 19:30:11 +02:00
f71805f.c hwmon: Let the user override the detected Super-I/O device ID 2008-02-07 20:39:42 -05:00
f71882fg.c hwmon: (f71882fg) Delete needless forward declarations 2008-08-06 22:41:04 +02:00
f75375s.c hwmon: (f75375s) Drop legacy i2c driver 2008-07-16 19:30:11 +02:00
fscher.c hwmon: (fscher) Convert to a new-style i2c driver 2008-07-16 19:30:12 +02:00
fschmd.c hwmon: (fschmd) Convert to a new-style i2c driver 2008-07-16 19:30:12 +02:00
fscpos.c hwmon: (fscpos) Convert to a new-style i2c driver 2008-07-16 19:30:12 +02:00
gl518sm.c hwmon: (gl518sm) Convert to a new-style i2c driver 2008-07-16 19:30:13 +02:00
gl520sm.c hwmon: (gl520sm) Convert to a new-style i2c driver 2008-07-16 19:30:13 +02:00
hdaps.c Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next 2008-07-21 00:55:14 -04:00
hwmon-vid.c hwmon-vid: Fix AMD K8 VID decoding 2008-08-15 11:50:15 -07:00
hwmon.c device create: hwmon: convert device_create to device_create_drvdata 2008-07-21 21:54:42 -07:00
i5k_amb.c i5k_amb: provide labels for temperature sensors 2008-08-15 08:35:43 -07:00
ibmaem.c ibmaem: don't query the entire sensor repository when reading energy meter 2008-08-15 08:35:44 -07:00
ibmpex.c ibmpex: report temperatures in mC, not C 2008-03-19 18:53:36 -07:00
it87.c hwmon: (it87) Prevent power-off on Shuttle SN68PT 2008-10-09 15:33:58 +02:00
k8temp.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
lm63.c hwmon: (lm63) Convert to a new-style i2c driver 2008-07-16 19:30:13 +02:00
lm70.c hwmon: (lm70) Convert semaphore to mutex 2007-11-08 08:42:46 -05:00
lm75.c hwmon: (lm75) Drop legacy i2c driver 2008-08-10 22:56:16 +02:00
lm75.h hwmon: Allow writing of negative trigger temperatures 2007-10-09 22:56:29 -04:00
lm77.c hwmon: (lm77) Convert to a new-style i2c driver 2008-07-16 19:30:13 +02:00
lm78.c hwmon: normal_i2c arrays should be const 2008-02-18 21:58:15 -05:00
lm80.c hwmon: (lm80) Convert to a new-style i2c driver 2008-07-16 19:30:14 +02:00
lm83.c hwmon: (lm83) Convert to a new-style i2c driver 2008-07-16 19:30:14 +02:00
lm85.c hwmon: (lm85) Simplify device initialization function 2008-07-31 23:44:03 -04:00
lm87.c hwmon: (lm87) Convert to a new-style i2c driver 2008-07-16 19:30:14 +02:00
lm90.c hwmon: (lm90) Convert to a new-style i2c driver 2008-07-16 19:30:15 +02:00
lm92.c hwmon: (lm92) Convert to a new-style i2c driver 2008-07-16 19:30:15 +02:00
lm93.c hwmon: (lm93) Convert to a new-style i2c driver 2008-07-16 19:30:15 +02:00
max1111.c hwmon: add max1111_read_channel() for use by sharpsl_pm 2008-09-23 22:04:32 +01:00
max1619.c hwmon: (max1619) Convert to a new-style i2c driver 2008-07-16 19:30:15 +02:00
max6650.c hwmon: (max6650) Convert to a new-style i2c driver 2008-07-16 19:30:16 +02:00
pc87360.c hwmon: Let the user override the detected Super-I/O device ID 2008-02-07 20:39:42 -05:00
pc87427.c hwmon: Let the user override the detected Super-I/O device ID 2008-02-07 20:39:42 -05:00
sis5595.c hwmon: (sis5595) Split sis5595_attributes_opt 2007-11-08 08:42:45 -05:00
smsc47b397.c Merge branch 'smsc47b397-new-id' into release 2008-05-01 07:33:17 -04:00
smsc47m1.c hwmon: (smsc47m1) Add individual alarm files 2008-02-17 09:27:18 -05:00
smsc47m192.c hwmon: (smsc47m192) Convert to a new-style i2c driver 2008-07-16 19:30:16 +02:00
thmc50.c hwmon: (thmc50) Add support for critical temperature limits 2008-08-06 22:41:05 +02:00
via686a.c hwmon: (via686a) Add individual alarm files 2008-02-17 09:27:18 -05:00
vt1211.c hwmon: Let the user override the detected Super-I/O device ID 2008-02-07 20:39:42 -05:00
vt8231.c hwmon: (vt8231) Update maintainer email address 2008-02-17 09:27:19 -05:00
w83l785ts.c hwmon: (w83l785ts) Convert to a new-style i2c driver 2008-07-16 19:30:18 +02:00
w83l786ng.c hwmon: (w83l786ng) Convert to a new-style i2c driver 2008-07-16 19:30:18 +02:00
w83627ehf.c hwmon: (w83627ehf) The W83627DHG has 8 VID pins 2008-02-07 20:39:45 -05:00
w83627hf.c hwmon: (w83627hf) Drop reset module parameter 2008-08-06 22:41:04 +02:00
w83781d.c hwmon: (w83781d) Fix I/O resource conflict with PNP 2008-03-27 08:40:41 -04:00
w83791d.c drivers/hwmon/w83791d.c: fix unused var warning 2008-08-15 08:35:43 -07:00
w83792d.c hwmon: (w83792d) Convert to a new-style i2c driver 2008-07-16 19:30:17 +02:00
w83793.c hwmon: (w83793) Convert to a new-style i2c driver 2008-07-16 19:30:17 +02:00