diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/hwmon/k8temp.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/hwmon/k8temp.c')
| -rw-r--r-- | drivers/hwmon/k8temp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c index 1fe995111841..0ceb6d6200a3 100644 --- a/drivers/hwmon/k8temp.c +++ b/drivers/hwmon/k8temp.c | |||
| @@ -136,7 +136,7 @@ static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 1, 0); | |||
| 136 | static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1); | 136 | static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1); |
| 137 | static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); | 137 | static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); |
| 138 | 138 | ||
| 139 | static struct pci_device_id k8temp_ids[] = { | 139 | static const struct pci_device_id k8temp_ids[] = { |
| 140 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, | 140 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, |
| 141 | { 0 }, | 141 | { 0 }, |
| 142 | }; | 142 | }; |