diff options
| -rw-r--r-- | drivers/watchdog/wdt_pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 02b6bdaa2dee..f368dd87083a 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c | |||
| @@ -80,7 +80,7 @@ static unsigned long open_lock; | |||
| 80 | static DEFINE_SPINLOCK(wdtpci_lock); | 80 | static DEFINE_SPINLOCK(wdtpci_lock); |
| 81 | static char expect_close; | 81 | static char expect_close; |
| 82 | 82 | ||
| 83 | static int io; | 83 | static resource_size_t io; |
| 84 | static int irq; | 84 | static int irq; |
| 85 | 85 | ||
| 86 | /* Default timeout */ | 86 | /* Default timeout */ |
| @@ -648,8 +648,8 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, | |||
| 648 | } | 648 | } |
| 649 | 649 | ||
| 650 | if (pci_request_region(dev, 2, "wdt_pci")) { | 650 | if (pci_request_region(dev, 2, "wdt_pci")) { |
| 651 | printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", | 651 | printk(KERN_ERR PFX "I/O address 0x%llx already in use\n", |
| 652 | pci_resource_start(dev, 2)); | 652 | (unsigned long long)pci_resource_start(dev, 2)); |
| 653 | goto out_pci; | 653 | goto out_pci; |
| 654 | } | 654 | } |
| 655 | 655 | ||
| @@ -663,8 +663,8 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, | |||
| 663 | } | 663 | } |
| 664 | 664 | ||
| 665 | printk(KERN_INFO | 665 | printk(KERN_INFO |
| 666 | "PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%04x (Interrupt %d)\n", | 666 | "PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%llx (Interrupt %d)\n", |
| 667 | io, irq); | 667 | (unsigned long long)io, irq); |
| 668 | 668 | ||
| 669 | /* Check that the heartbeat value is within its range; | 669 | /* Check that the heartbeat value is within its range; |
| 670 | if not reset to the default */ | 670 | if not reset to the default */ |
