summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 16:05:43 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 16:05:43 -0700
commitc5b7bede71853d92fc747cdc12fa5234b6045731 (patch)
tree922284456a74150e679126e73551b64ba9c00bf2 /drivers
parentfb2c922b8588115d8914492493a37109bfb07884 (diff)
parent5c34202b8bf942da411b6599668a76b07449bbfd (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] iTCO_wdt.c - fix ACPI Base register
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/watchdog/iTCO_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/char/watchdog/iTCO_wdt.c
index 3c9684ccd2f..eac4f9b9f00 100644
--- a/drivers/char/watchdog/iTCO_wdt.c
+++ b/drivers/char/watchdog/iTCO_wdt.c
@@ -571,7 +571,7 @@ static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent,
* ACPIBASE is bits [15:7] from 0x40-0x43
*/
pci_read_config_dword(pdev, 0x40, &base_address);
- base_address &= 0x00007f80;
+ base_address &= 0x0000ff80;
if (base_address == 0x00000000) {
/* Something's wrong here, ACPIBASE has to be set */
printk(KERN_ERR PFX "failed to get TCOBASE address\n");