diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 11:59:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 11:59:51 -0800 |
| commit | 2f2408a88cf8fa43febfd7fb5783e61b2937b0f9 (patch) | |
| tree | 4f49e5113ec8fe0554e1a8766b25d21f6fbc5a69 /drivers/hwmon/pc87427.c | |
| parent | fa7b906e7fef53b6c9eb3ecb8164b0a69e9e1a68 (diff) | |
| parent | 77fa49d94a75b5f9702c70b4fbe27b08b21317b9 (diff) | |
| download | kernel_samsung_smdk4412-2f2408a88cf8fa43febfd7fb5783e61b2937b0f9.zip kernel_samsung_smdk4412-2f2408a88cf8fa43febfd7fb5783e61b2937b0f9.tar.gz kernel_samsung_smdk4412-2f2408a88cf8fa43febfd7fb5783e61b2937b0f9.tar.bz2 | |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (29 commits)
hwmon: Fix various typos
hwmon: Check for ACPI resource conflicts
hwmon: (lm70) Add TI TMP121 support
hwmon: (lm70) Code streamlining and cleanup
hwmon: Deprecate the fscher and fscpos drivers
hwmon: (fschmd) Add watchdog support
hwmon: (fschmd) Cleanups for watchdog support
hwmon: (i5k_amb) Load automatically on all 5000/5400 chipsets
hwmon: (it87) Add support for the ITE IT8720F
hwmon: Don't overuse I2C_CLIENT_MODULE_PARM
hwmon: Add LTC4245 driver
hwmon: (f71882fg) Fix fan_to/from_reg prototypes
hwmon: (f71882fg) Printout fan modes
hwmon: (f71882fg) Add documentation
hwmon: (f71882fg) Fix auto_channels_temp temp numbering with f8000
hwmon: (f71882fg) Add missing pwm3 attr for f71862fg
hwmon: (f71882fg) Add F8000 support
hwmon: (f71882fg) Remove the fan_mode module option
hwmon: (f71882fg) Separate max and crit alarm and beep
hwmon: (f71882fg) Check for hwmon powerdown state
...
Diffstat (limited to 'drivers/hwmon/pc87427.c')
| -rw-r--r-- | drivers/hwmon/pc87427.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c index 7265f22..3a8a0f7 100644 --- a/drivers/hwmon/pc87427.c +++ b/drivers/hwmon/pc87427.c @@ -32,6 +32,7 @@ #include <linux/mutex.h> #include <linux/sysfs.h> #include <linux/ioport.h> +#include <linux/acpi.h> #include <asm/io.h> static unsigned short force_id; @@ -524,6 +525,10 @@ static int __init pc87427_device_add(unsigned short address) }; int err; + err = acpi_check_resource_conflict(&res); + if (err) + goto exit; + pdev = platform_device_alloc(DRVNAME, address); if (!pdev) { err = -ENOMEM; |