diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /Documentation/pnp.txt | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'Documentation/pnp.txt')
| -rw-r--r-- | Documentation/pnp.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pnp.txt b/Documentation/pnp.txt index 9ff966bf76e6..28037aa1846c 100644 --- a/Documentation/pnp.txt +++ b/Documentation/pnp.txt | |||
| @@ -184,7 +184,7 @@ static const struct pnp_id pnp_dev_table[] = { | |||
| 184 | Please note that the character 'X' can be used as a wild card in the function | 184 | Please note that the character 'X' can be used as a wild card in the function |
| 185 | portion (last four characters). | 185 | portion (last four characters). |
| 186 | ex: | 186 | ex: |
| 187 | /* Unkown PnP modems */ | 187 | /* Unknown PnP modems */ |
| 188 | { "PNPCXXX", UNKNOWN_DEV }, | 188 | { "PNPCXXX", UNKNOWN_DEV }, |
| 189 | 189 | ||
| 190 | Supported PnP card IDs can optionally be defined. | 190 | Supported PnP card IDs can optionally be defined. |