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 /Documentation/eisa.txt | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/eisa.txt')
| -rw-r--r-- | Documentation/eisa.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt index f297fc1202ae..38cf0c7b559f 100644 --- a/Documentation/eisa.txt +++ b/Documentation/eisa.txt | |||
| @@ -84,7 +84,7 @@ struct eisa_driver { | |||
| 84 | 84 | ||
| 85 | id_table : an array of NULL terminated EISA id strings, | 85 | id_table : an array of NULL terminated EISA id strings, |
| 86 | followed by an empty string. Each string can | 86 | followed by an empty string. Each string can |
| 87 | optionally be paired with a driver-dependant value | 87 | optionally be paired with a driver-dependent value |
| 88 | (driver_data). | 88 | (driver_data). |
| 89 | 89 | ||
| 90 | driver : a generic driver, such as described in | 90 | driver : a generic driver, such as described in |