git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/scsi
[safe/jmp/linux-2.6]
/
drivers
/
hwmon
/
smsc47b397.c
diff --git
a/drivers/hwmon/smsc47b397.c
b/drivers/hwmon/smsc47b397.c
index
54187bf
..
6f6d52b
100644
(file)
--- a/
drivers/hwmon/smsc47b397.c
+++ b/
drivers/hwmon/smsc47b397.c
@@
-36,8
+36,13
@@
#include <linux/err.h>
#include <linux/init.h>
#include <linux/mutex.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/mutex.h>
+#include <linux/acpi.h>
#include <asm/io.h>
#include <asm/io.h>
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
static struct platform_device *pdev;
#define DRVNAME "smsc47b397"
static struct platform_device *pdev;
#define DRVNAME "smsc47b397"
@@
-299,6
+304,10
@@
static int __init smsc47b397_device_add(unsigned short address)
};
int err;
};
int err;
+ err = acpi_check_resource_conflict(&res);
+ if (err)
+ goto exit;
+
pdev = platform_device_alloc(DRVNAME, address);
if (!pdev) {
err = -ENOMEM;
pdev = platform_device_alloc(DRVNAME, address);
if (!pdev) {
err = -ENOMEM;
@@
-334,7
+343,7
@@
static int __init smsc47b397_find(unsigned short *addr)
char *name;
superio_enter();
char *name;
superio_enter();
- id = superio_inb(SUPERIO_REG_DEVID);
+ id =
force_id ? force_id :
superio_inb(SUPERIO_REG_DEVID);
switch(id) {
case 0x81:
switch(id) {
case 0x81: