diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/isapnp.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/isapnp.h')
| -rw-r--r-- | include/linux/isapnp.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h index 1e8728a9ee8a..cd5a269fdb5e 100644 --- a/include/linux/isapnp.h +++ b/include/linux/isapnp.h | |||
| @@ -26,16 +26,6 @@ | |||
| 26 | #include <linux/pnp.h> | 26 | #include <linux/pnp.h> |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * Configuration registers (TODO: change by specification) | ||
| 30 | */ | ||
| 31 | |||
| 32 | #define ISAPNP_CFG_ACTIVATE 0x30 /* byte */ | ||
| 33 | #define ISAPNP_CFG_MEM 0x40 /* 4 * dword */ | ||
| 34 | #define ISAPNP_CFG_PORT 0x60 /* 8 * word */ | ||
| 35 | #define ISAPNP_CFG_IRQ 0x70 /* 2 * word */ | ||
| 36 | #define ISAPNP_CFG_DMA 0x74 /* 2 * byte */ | ||
| 37 | |||
| 38 | /* | ||
| 39 | * | 29 | * |
| 40 | */ | 30 | */ |
| 41 | 31 | ||