diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/watchdog/sbc_epx_c3.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/watchdog/sbc_epx_c3.c')
| -rw-r--r-- | drivers/watchdog/sbc_epx_c3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c index 28f1214457bd..3066a5127ca8 100644 --- a/drivers/watchdog/sbc_epx_c3.c +++ b/drivers/watchdog/sbc_epx_c3.c | |||
| @@ -220,7 +220,7 @@ module_exit(watchdog_exit); | |||
| 220 | MODULE_AUTHOR("Calin A. Culianu <calin@ajvar.org>"); | 220 | MODULE_AUTHOR("Calin A. Culianu <calin@ajvar.org>"); |
| 221 | MODULE_DESCRIPTION("Hardware Watchdog Device for Winsystems EPX-C3 SBC. " | 221 | MODULE_DESCRIPTION("Hardware Watchdog Device for Winsystems EPX-C3 SBC. " |
| 222 | "Note that there is no way to probe for this device -- " | 222 | "Note that there is no way to probe for this device -- " |
| 223 | "so only use it if you are *sure* you are runnning on this specific " | 223 | "so only use it if you are *sure* you are running on this specific " |
| 224 | "SBC system from Winsystems! It writes to IO ports 0x1ee and 0x1ef!"); | 224 | "SBC system from Winsystems! It writes to IO ports 0x1ee and 0x1ef!"); |
| 225 | MODULE_LICENSE("GPL"); | 225 | MODULE_LICENSE("GPL"); |
| 226 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 226 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |