From d8fec87644d96f0167ef713f58a5b2ab6bd9b7c7 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 28 Apr 2008 16:33:49 -0600 Subject: [PATCH] --- yaml --- r: 95543 b: refs/heads/master c: ca0e8b6fd29819891c874b86ff286987c5bfdc21 h: refs/heads/master i: 95541: 6e8fa50b2e223f4e1b595b8d98a74b5c0bbec919 95539: 3f92fb01a37ba1b84dd1e3232ad7bfb2be98462a 95535: d1f2cf8b3f86b49d7b485acd725c130601eaa484 v: v3 --- [refs] | 2 +- trunk/drivers/pnp/isapnp/core.c | 8 ++++++++ trunk/include/linux/isapnp.h | 10 ---------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index c3860deaa474..4fe94cb8b9f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bd17e63a068db6f464925a79b1cc4b27a8b1af9 +refs/heads/master: ca0e8b6fd29819891c874b86ff286987c5bfdc21 diff --git a/trunk/drivers/pnp/isapnp/core.c b/trunk/drivers/pnp/isapnp/core.c index 257f5d827d83..dd67752a5828 100644 --- a/trunk/drivers/pnp/isapnp/core.c +++ b/trunk/drivers/pnp/isapnp/core.c @@ -88,6 +88,14 @@ MODULE_LICENSE("GPL"); #define _LTAG_MEM32RANGE 0x85 #define _LTAG_FIXEDMEM32RANGE 0x86 +/* Logical device control and configuration registers */ + +#define ISAPNP_CFG_ACTIVATE 0x30 /* byte */ +#define ISAPNP_CFG_MEM 0x40 /* 4 * dword */ +#define ISAPNP_CFG_PORT 0x60 /* 8 * word */ +#define ISAPNP_CFG_IRQ 0x70 /* 2 * word */ +#define ISAPNP_CFG_DMA 0x74 /* 2 * byte */ + /* * Sizes of ISAPNP logical device configuration register sets. * See PNP-ISA-v1.0a.pdf, Appendix A. diff --git a/trunk/include/linux/isapnp.h b/trunk/include/linux/isapnp.h index 1e8728a9ee8a..cd5a269fdb5e 100644 --- a/trunk/include/linux/isapnp.h +++ b/trunk/include/linux/isapnp.h @@ -25,16 +25,6 @@ #include #include -/* - * Configuration registers (TODO: change by specification) - */ - -#define ISAPNP_CFG_ACTIVATE 0x30 /* byte */ -#define ISAPNP_CFG_MEM 0x40 /* 4 * dword */ -#define ISAPNP_CFG_PORT 0x60 /* 8 * word */ -#define ISAPNP_CFG_IRQ 0x70 /* 2 * word */ -#define ISAPNP_CFG_DMA 0x74 /* 2 * byte */ - /* * */