aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorBen Collins <bcollins@ubuntu.com>2006-10-18 08:24:30 -0400
committerBen Collins <bcollins@ubuntu.com>2006-10-18 08:24:30 -0400
commit5cacb9f8bca1ac67cc1f933a4e89b5130ffd1460 (patch)
treef1e899a74b37e4da9f0e6fb36dd3986eab53e046 /drivers/char
parent9950421c1e90d08d52ef47df1fcebe6078b04af3 (diff)
[alim7101] Add pci dev table for auto module loading.
Also fixes comment for nowayout module param. Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/alim7101_wdt.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c
index 5948863b592b..bf25d0a55a99 100644
--- a/drivers/char/watchdog/alim7101_wdt.c
+++ b/drivers/char/watchdog/alim7101_wdt.c
@@ -77,7 +77,8 @@ static struct pci_dev *alim7101_pmu;
77 77
78static int nowayout = WATCHDOG_NOWAYOUT; 78static int nowayout = WATCHDOG_NOWAYOUT;
79module_param(nowayout, int, 0); 79module_param(nowayout, int, 0);
80MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); 80MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
81 __stringify(CONFIG_WATCHDOG_NOWAYOUT) ")");
81 82
82/* 83/*
83 * Whack the dog 84 * Whack the dog
@@ -415,6 +416,16 @@ err_out:
415module_init(alim7101_wdt_init); 416module_init(alim7101_wdt_init);
416module_exit(alim7101_wdt_unload); 417module_exit(alim7101_wdt_unload);
417 418
419static struct pci_device_id alim7101_pci_tbl[] __devinitdata = {
420 { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
421 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
422 { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
423 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
424 { }
425};
426
427MODULE_DEVICE_TABLE(pci, alim7101_pci_tbl);
428
418MODULE_AUTHOR("Steve Hill"); 429MODULE_AUTHOR("Steve Hill");
419MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver"); 430MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver");
420MODULE_LICENSE("GPL"); 431MODULE_LICENSE("GPL");