← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to drivers/hwmon/sht15.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/hwmon/sht15.c
32
32
#include <linux/sht15.h>
33
33
#include <linux/regulator/consumer.h>
34
34
#include <linux/slab.h>
35
 
#include <asm/atomic.h>
 
35
#include <linux/atomic.h>
36
36
 
37
37
/* Commands */
38
38
#define SHT15_MEASURE_TEMP              0x03
671
671
 * @buf:        sysfs buffer to read the new heater state from.
672
672
 * @count:      length of the data.
673
673
 *
674
 
 * Will be called on read access to heater_enable sysfs attribute.
 
674
 * Will be called on write access to heater_enable sysfs attribute.
675
675
 * Returns number of bytes actually decoded, negative errno on error.
676
676
 */
677
677
static ssize_t sht15_store_heater(struct device *dev,