Merge branch 'smsc47b397-new-id' into release

[sfrench/cifs-2.6.git] / drivers / hwmon / smsc47b397.c

diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 54187bf25d34e695f8b82e6d5db388094e7ed440..eb03544c731ca47dd94c6d7d940b3f66a43dbcdd 100644 (file)
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -38,6 +38,10 @@
 #include <linux/mutex.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"
@@ -334,7 +338,7 @@ static int __init smsc47b397_find(unsigned short *addr)
        char *name;
 
        superio_enter();
-       id = superio_inb(SUPERIO_REG_DEVID);
+       id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
 
        switch(id) {
        case 0x81: