diff options
| author | Darrick J. Wong <djwong@us.ibm.com> | 2009-01-07 18:37:33 +0300 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-01-07 18:37:33 +0300 |
| commit | 6e31eb2b297c7b6678e6e77393bb8d01b5228bda (patch) | |
| tree | b92cf708f6812e2c4abc849bfe7a0190935d8877 /drivers/hwmon | |
| parent | b4da93e4b0ffc261c3530fe938aefd52854aa84c (diff) | |
| download | linux-6e31eb2b297c7b6678e6e77393bb8d01b5228bda.tar.xz | |
hwmon: (i5k_amb) Load automatically on all 5000/5400 chipsets
It turns out that we cannot create a pci_driver in this driver because PCI will
not call this module's probe function if the i5000-edac driver is already
loaded. That said, we only want one value (AMBASE) from the PCI config space.
Neither driver alters this value, so it's safe to read it. However, we still
want the module aliases, so provide that.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/i5k_amb.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index 2ede9388096b..27d7f72a5f11 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c @@ -490,6 +490,13 @@ static unsigned long chipset_ids[] = { 0 }; +static struct pci_device_id i5k_amb_ids[] __devinitdata = { + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) }, + { 0, } +}; +MODULE_DEVICE_TABLE(pci, i5k_amb_ids); + static int __devinit i5k_amb_probe(struct platform_device *pdev) { struct i5k_amb_data *data; |