Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[safe/jmp/linux-2.6] / include / linux / isapnp.h

diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h
index 1e8728a..cd5a269 100644 (file)
--- a/include/linux/isapnp.h
+++ b/include/linux/isapnp.h
@@ -26,16 +26,6 @@
 #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 */
-
-/*
  *
  */