From: Mark M. Hoffman <mhoffman@lightlink.com>
Date: Thu, 1 May 2008 11:33:17 +0000 (-0400)
Subject: Merge branch 'smsc47b397-new-id' into release
X-Git-Tag: v2.6.26-rc1~22^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4f02f8220562591322c118d07a32bebf705318b7;p=linux-2.6-omap-h63xx.git

Merge branch 'smsc47b397-new-id' into release
---

4f02f8220562591322c118d07a32bebf705318b7
diff --cc drivers/hwmon/smsc47b397.c
index f61d8f4185b,54187bf25d3..eb03544c731
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@@ -335,11 -331,23 +335,23 @@@ exit
  static int __init smsc47b397_find(unsigned short *addr)
  {
  	u8 id, rev;
+ 	char *name;
  
  	superio_enter();
 -	id = superio_inb(SUPERIO_REG_DEVID);
 +	id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
  
- 	if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) {
+ 	switch(id) {
+ 	case 0x81:
+ 		name = "SCH5307-NS";
+ 		break;
+ 	case 0x6f:
+ 		name = "LPC47B397-NC";
+ 		break;
+ 	case 0x85:
+ 	case 0x8c:
+ 		name = "SCH5317";
+ 		break;
+ 	default:
  		superio_exit();
  		return -ENODEV;
  	}