diff options
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
-rw-r--r-- | drivers/watchdog/hpwdt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index f0ecb14990df..e18f6b9f7947 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
@@ -48,8 +48,8 @@ static unsigned long __iomem *hpwdt_timer_reg; | |||
48 | static unsigned long __iomem *hpwdt_timer_con; | 48 | static unsigned long __iomem *hpwdt_timer_con; |
49 | 49 | ||
50 | static struct pci_device_id hpwdt_devices[] = { | 50 | static struct pci_device_id hpwdt_devices[] = { |
51 | { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) }, | 51 | { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) }, /* iLO2 */ |
52 | { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) }, | 52 | { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) }, /* iLO3 */ |
53 | {0}, /* terminate list */ | 53 | {0}, /* terminate list */ |
54 | }; | 54 | }; |
55 | MODULE_DEVICE_TABLE(pci, hpwdt_devices); | 55 | MODULE_DEVICE_TABLE(pci, hpwdt_devices); |
@@ -548,7 +548,7 @@ static const struct watchdog_info ident = { | |||
548 | .options = WDIOF_SETTIMEOUT | | 548 | .options = WDIOF_SETTIMEOUT | |
549 | WDIOF_KEEPALIVEPING | | 549 | WDIOF_KEEPALIVEPING | |
550 | WDIOF_MAGICCLOSE, | 550 | WDIOF_MAGICCLOSE, |
551 | .identity = "HP iLO2 HW Watchdog Timer", | 551 | .identity = "HP iLO2+ HW Watchdog Timer", |
552 | }; | 552 | }; |
553 | 553 | ||
554 | static long hpwdt_ioctl(struct file *file, unsigned int cmd, | 554 | static long hpwdt_ioctl(struct file *file, unsigned int cmd, |
@@ -654,13 +654,13 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
654 | hpwdt_check_nmi_sourcing(dev); | 654 | hpwdt_check_nmi_sourcing(dev); |
655 | 655 | ||
656 | /* | 656 | /* |
657 | * First let's find out if we are on an iLO2 server. We will | 657 | * First let's find out if we are on an iLO2+ server. We will |
658 | * not run on a legacy ASM box. | 658 | * not run on a legacy ASM box. |
659 | * So we only support the G5 ProLiant servers and higher. | 659 | * So we only support the G5 ProLiant servers and higher. |
660 | */ | 660 | */ |
661 | if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) { | 661 | if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) { |
662 | dev_warn(&dev->dev, | 662 | dev_warn(&dev->dev, |
663 | "This server does not have an iLO2 ASIC.\n"); | 663 | "This server does not have an iLO2+ ASIC.\n"); |
664 | return -ENODEV; | 664 | return -ENODEV; |
665 | } | 665 | } |
666 | 666 | ||
@@ -674,7 +674,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
674 | pci_mem_addr = pci_iomap(dev, 1, 0x80); | 674 | pci_mem_addr = pci_iomap(dev, 1, 0x80); |
675 | if (!pci_mem_addr) { | 675 | if (!pci_mem_addr) { |
676 | dev_warn(&dev->dev, | 676 | dev_warn(&dev->dev, |
677 | "Unable to detect the iLO2 server memory.\n"); | 677 | "Unable to detect the iLO2+ server memory.\n"); |
678 | retval = -ENOMEM; | 678 | retval = -ENOMEM; |
679 | goto error_pci_iomap; | 679 | goto error_pci_iomap; |
680 | } | 680 | } |