diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 19:09:03 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 19:09:03 +0200 |
| commit | 87045b033a62777337ae4aa62834876da09b5fb5 (patch) | |
| tree | 26aefd28e436668ff906e42b1e0d75c056e33e01 /drivers/hwmon/hwmon-vid.c | |
| parent | [SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu (diff) | |
| parent | [SCSI] fix crash in scsi_dispatch_cmd() (diff) | |
| download | linux-87045b033a62777337ae4aa62834876da09b5fb5.tar.xz linux-87045b033a62777337ae4aa62834876da09b5fb5.zip | |
Merge branch 'scsi-fixes'
Diffstat (limited to 'drivers/hwmon/hwmon-vid.c')
| -rw-r--r-- | drivers/hwmon/hwmon-vid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index 2582bfef6ccb..c8195a077da3 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c @@ -202,7 +202,7 @@ static struct vrm_model vrm_models[] = { {X86_VENDOR_CENTAUR, 0x6, 0x7, ANY, 85}, /* Eden ESP/Ezra */ {X86_VENDOR_CENTAUR, 0x6, 0x8, 0x7, 85}, /* Ezra T */ - {X86_VENDOR_CENTAUR, 0x6, 0x9, 0x7, 85}, /* Nemiah */ + {X86_VENDOR_CENTAUR, 0x6, 0x9, 0x7, 85}, /* Nehemiah */ {X86_VENDOR_CENTAUR, 0x6, 0x9, ANY, 17}, /* C3-M, Eden-N */ {X86_VENDOR_CENTAUR, 0x6, 0xA, 0x7, 0}, /* No information */ {X86_VENDOR_CENTAUR, 0x6, 0xA, ANY, 13}, /* C7, Esther */ |