diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 12:06:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 12:06:27 -0700 |
| commit | 74e8f346d59074147c564d9c1ffd6caf18286516 (patch) | |
| tree | 9903bba71a4c9bf60c2000f5cfa682840f04297f /drivers/char/watchdog/alim1535_wdt.c | |
| parent | 7da6cd8bdfe13fecc061b868dda57ee1a3a051f4 (diff) | |
| parent | 6e420b7e26dd539f1f78fe920d295b022a2d99c8 (diff) | |
| download | kernel_samsung_aries-74e8f346d59074147c564d9c1ffd6caf18286516.zip kernel_samsung_aries-74e8f346d59074147c564d9c1ffd6caf18286516.tar.gz kernel_samsung_aries-74e8f346d59074147c564d9c1ffd6caf18286516.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] Add support for 1533 bridge to alim1535_wdt
[WATCHDOG] Add a 00-INDEX file to Documentation/watchdog/
[WATCHDOG] Eurotechwdt.c - clean-up comments
Diffstat (limited to 'drivers/char/watchdog/alim1535_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/alim1535_wdt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/watchdog/alim1535_wdt.c b/drivers/char/watchdog/alim1535_wdt.c index e3f6a7d..c404fc6 100644 --- a/drivers/char/watchdog/alim1535_wdt.c +++ b/drivers/char/watchdog/alim1535_wdt.c @@ -312,6 +312,7 @@ static int ali_notify_sys(struct notifier_block *this, unsigned long code, void */ static struct pci_device_id ali_pci_tbl[] = { + { PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,}, { PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,}, { 0, }, }; @@ -329,9 +330,11 @@ static int __init ali_find_watchdog(void) struct pci_dev *pdev; u32 wdog; - /* Check for a 1535 series bridge */ + /* Check for a 1533/1535 series bridge */ pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1535, NULL); - if(pdev == NULL) + if (pdev == NULL) + pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1533, NULL); + if (pdev == NULL) return -ENODEV; pci_dev_put(pdev); |