diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 19:05:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 19:05:43 -0400 |
| commit | c5b7bede71853d92fc747cdc12fa5234b6045731 (patch) | |
| tree | 922284456a74150e679126e73551b64ba9c00bf2 | |
| parent | fb2c922b8588115d8914492493a37109bfb07884 (diff) | |
| parent | 5c34202b8bf942da411b6599668a76b07449bbfd (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
| -rw-r--r-- | drivers/char/watchdog/iTCO_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/char/watchdog/iTCO_wdt.c index 3c9684ccd2f9..eac4f9b9f007 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, | |||
| 571 | * ACPIBASE is bits [15:7] from 0x40-0x43 | 571 | * ACPIBASE is bits [15:7] from 0x40-0x43 |
| 572 | */ | 572 | */ |
| 573 | pci_read_config_dword(pdev, 0x40, &base_address); | 573 | pci_read_config_dword(pdev, 0x40, &base_address); |
| 574 | base_address &= 0x00007f80; | 574 | base_address &= 0x0000ff80; |
| 575 | if (base_address == 0x00000000) { | 575 | if (base_address == 0x00000000) { |
| 576 | /* Something's wrong here, ACPIBASE has to be set */ | 576 | /* Something's wrong here, ACPIBASE has to be set */ |
| 577 | printk(KERN_ERR PFX "failed to get TCOBASE address\n"); | 577 | printk(KERN_ERR PFX "failed to get TCOBASE address\n"); |