From 3f481ca999a90dcc2873f607a9cf7f660012bed8 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 7 Aug 2009 15:02:00 -0700 Subject: [PATCH] --- yaml --- r: 163623 b: refs/heads/master c: d1833c21256e7b0ac3997493d31f0f3926f6d592 h: refs/heads/master i: 163621: f90bae36a52f89e23661c0c2443261b8471e899e 163619: 994392add34beb205a7e0e1cf29a8990cf6dd5e8 163615: e4dc0bb05e20baf71e64463eadeea4d95fbf4196 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/wdt_pci.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7e2fcce412ff..fb74a08022a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 119d3e56e7c82a73d27b5dd010c52dab1bc9f846 +refs/heads/master: d1833c21256e7b0ac3997493d31f0f3926f6d592 diff --git a/trunk/drivers/watchdog/wdt_pci.c b/trunk/drivers/watchdog/wdt_pci.c index 02b6bdaa2dee..f368dd87083a 100644 --- a/trunk/drivers/watchdog/wdt_pci.c +++ b/trunk/drivers/watchdog/wdt_pci.c @@ -80,7 +80,7 @@ static unsigned long open_lock; static DEFINE_SPINLOCK(wdtpci_lock); static char expect_close; -static int io; +static resource_size_t io; static int irq; /* Default timeout */ @@ -648,8 +648,8 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, } if (pci_request_region(dev, 2, "wdt_pci")) { - printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", - pci_resource_start(dev, 2)); + printk(KERN_ERR PFX "I/O address 0x%llx already in use\n", + (unsigned long long)pci_resource_start(dev, 2)); goto out_pci; } @@ -663,8 +663,8 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, } printk(KERN_INFO - "PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%04x (Interrupt %d)\n", - io, irq); + "PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%llx (Interrupt %d)\n", + (unsigned long long)io, irq); /* Check that the heartbeat value is within its range; if not reset to the default */