diff options
| author | Ben Collins <bcollins@ubuntu.com> | 2006-10-18 08:24:30 -0400 |
|---|---|---|
| committer | Ben Collins <bcollins@ubuntu.com> | 2006-10-18 08:24:30 -0400 |
| commit | 5cacb9f8bca1ac67cc1f933a4e89b5130ffd1460 (patch) | |
| tree | f1e899a74b37e4da9f0e6fb36dd3986eab53e046 /drivers/char/watchdog | |
| parent | 9950421c1e90d08d52ef47df1fcebe6078b04af3 (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/watchdog')
| -rw-r--r-- | drivers/char/watchdog/alim7101_wdt.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c index 5948863b592..bf25d0a55a9 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; static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); -MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" + __stringify(CONFIG_WATCHDOG_NOWAYOUT) ")"); /* * Whack the dog @@ -415,6 +416,16 @@ err_out: module_init(alim7101_wdt_init); module_exit(alim7101_wdt_unload); +static struct pci_device_id alim7101_pci_tbl[] __devinitdata = { + { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + { } +}; + +MODULE_DEVICE_TABLE(pci, alim7101_pci_tbl); + MODULE_AUTHOR("Steve Hill"); MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver"); MODULE_LICENSE("GPL"); |