diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /include/linux/pnp.h | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/linux/pnp.h')
| -rw-r--r-- | include/linux/pnp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index cd6332b88829..29dd55838e84 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/mod_devicetable.h> | 14 | #include <linux/mod_devicetable.h> |
| 15 | 15 | ||
| 16 | #define PNP_MAX_PORT 40 | 16 | #define PNP_MAX_PORT 40 |
| 17 | #define PNP_MAX_MEM 12 | 17 | #define PNP_MAX_MEM 24 |
| 18 | #define PNP_MAX_IRQ 2 | 18 | #define PNP_MAX_IRQ 2 |
| 19 | #define PNP_MAX_DMA 2 | 19 | #define PNP_MAX_DMA 2 |
| 20 | #define PNP_NAME_LEN 50 | 20 | #define PNP_NAME_LEN 50 |