diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /console-client/driver.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'console-client/driver.c')
| -rw-r--r-- | console-client/driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/console-client/driver.c b/console-client/driver.c index 2a56729d..7f799f0a 100644 --- a/console-client/driver.c +++ b/console-client/driver.c @@ -83,7 +83,7 @@ driver_fini (void) /* Load, intialize and (if START is non-zero) start the driver DRIVER under the given NAME (which must be unique among all loaded - drivers) with arguments ARGZ with length ARGZ_LEN. This funtion + drivers) with arguments ARGZ with length ARGZ_LEN. This function will grab the driver list lock. The driver itself might try to grab the display, input source and bell list locks as well. */ error_t driver_add (const char *const name, const char *const driver, |