ISAPNP: move config register addresses out of isapnp.h

These are used only in drivers/pnp/isapnp/core.c, so no need to
expose them to the world.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 257f5d827d8365ac1563f7c986f0a74504acaebf..dd67752a5828d33d67e1848917584f6877a92ef9 100644 (file)
--- a/drivers/pnp/isapnp/core.c
+++ b/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/include/linux/isapnp.h b/include/linux/isapnp.h
index 1e8728a9ee8a0bce0e05e1fa41cb47a09876d053..cd5a269fdb5e3a5280002c6dd767ee4efe331a48 100644 (file)
--- a/include/linux/isapnp.h
+++ b/include/linux/isapnp.h
@@ -25,16 +25,6 @@
 #include <linux/errno.h>
 #include <linux/pnp.h>
 
-/*
- *  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 */
-
 /*
  *
  */