|
@@ -47,6 +47,7 @@
|
|
#define PCI_BIOS32_PARAGRAPH_LEN 16
|
|
#define PCI_BIOS32_PARAGRAPH_LEN 16
|
|
#define PCI_ROM_BASE1 0x000F0000
|
|
#define PCI_ROM_BASE1 0x000F0000
|
|
#define ROM_SIZE 0x10000
|
|
#define ROM_SIZE 0x10000
|
|
|
|
+#define HPWDT_VERSION "1.01"
|
|
|
|
|
|
struct bios32_service_dir {
|
|
struct bios32_service_dir {
|
|
u32 signature;
|
|
u32 signature;
|
|
@@ -130,12 +131,8 @@ static void *cru_rom_addr;
|
|
static struct cmn_registers cmn_regs;
|
|
static struct cmn_registers cmn_regs;
|
|
|
|
|
|
static struct pci_device_id hpwdt_devices[] = {
|
|
static struct pci_device_id hpwdt_devices[] = {
|
|
- {
|
|
|
|
- .vendor = PCI_VENDOR_ID_COMPAQ,
|
|
|
|
- .device = 0xB203,
|
|
|
|
- .subvendor = PCI_ANY_ID,
|
|
|
|
- .subdevice = PCI_ANY_ID,
|
|
|
|
- },
|
|
|
|
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },
|
|
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },
|
|
{0}, /* terminate list */
|
|
{0}, /* terminate list */
|
|
};
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, hpwdt_devices);
|
|
MODULE_DEVICE_TABLE(pci, hpwdt_devices);
|
|
@@ -704,10 +701,11 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
|
|
}
|
|
}
|
|
|
|
|
|
printk(KERN_INFO
|
|
printk(KERN_INFO
|
|
- "hp Watchdog Timer Driver: 1.00"
|
|
|
|
|
|
+ "hp Watchdog Timer Driver: %s"
|
|
", timer margin: %d seconds (nowayout=%d)"
|
|
", timer margin: %d seconds (nowayout=%d)"
|
|
", allow kernel dump: %s (default = 0/OFF).\n",
|
|
", allow kernel dump: %s (default = 0/OFF).\n",
|
|
- soft_margin, nowayout, (allow_kdump == 0) ? "OFF" : "ON");
|
|
|
|
|
|
+ HPWDT_VERSION, soft_margin, nowayout,
|
|
|
|
+ (allow_kdump == 0) ? "OFF" : "ON");
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
@@ -757,6 +755,7 @@ static int __init hpwdt_init(void)
|
|
MODULE_AUTHOR("Tom Mingarelli");
|
|
MODULE_AUTHOR("Tom Mingarelli");
|
|
MODULE_DESCRIPTION("hp watchdog driver");
|
|
MODULE_DESCRIPTION("hp watchdog driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
+MODULE_VERSION(HPWDT_VERSION);
|
|
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
|
|
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
|
|
|
|
|
|
module_param(soft_margin, int, 0);
|
|
module_param(soft_margin, int, 0);
|