diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /drivers/char/ipmi | |
| parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
| parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/char/ipmi')
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index f2e5cb1bedf3..1dd3a065f57b 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
| @@ -2215,7 +2215,8 @@ static int ipmi_pci_resume(struct pci_dev *pdev) | |||
| 2215 | 2215 | ||
| 2216 | static struct pci_device_id ipmi_pci_devices[] = { | 2216 | static struct pci_device_id ipmi_pci_devices[] = { |
| 2217 | { PCI_DEVICE(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID) }, | 2217 | { PCI_DEVICE(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID) }, |
| 2218 | { PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE_MASK) } | 2218 | { PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE_MASK) }, |
| 2219 | { 0, } | ||
| 2219 | }; | 2220 | }; |
| 2220 | MODULE_DEVICE_TABLE(pci, ipmi_pci_devices); | 2221 | MODULE_DEVICE_TABLE(pci, ipmi_pci_devices); |
| 2221 | 2222 | ||