summaryrefslogtreecommitdiff
path: root/drivers/net/tulip/de4x5.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-21 15:28:24 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-21 15:28:24 +0400
commit470fba7ebe60ad9185056b080b331abad24b4df9 (patch)
treef83bc13d97adaf5dd0e0f1d6a157b890f868577f /drivers/net/tulip/de4x5.h
parent7225e75144b9718cbbe1820d9c011c809d5773fd (diff)
parent6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff)
downloadlinux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz
Merge branch 'linus' into x86/doc
Diffstat (limited to 'drivers/net/tulip/de4x5.h')
-rw-r--r--drivers/net/tulip/de4x5.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/tulip/de4x5.h b/drivers/net/tulip/de4x5.h
index f5f33b3eb067..9f2877438fb0 100644
--- a/drivers/net/tulip/de4x5.h
+++ b/drivers/net/tulip/de4x5.h
@@ -1004,8 +1004,7 @@ struct de4x5_ioctl {
*/
#define DE4X5_GET_HWADDR 0x01 /* Get the hardware address */
#define DE4X5_SET_HWADDR 0x02 /* Set the hardware address */
-#define DE4X5_SET_PROM 0x03 /* Set Promiscuous Mode */
-#define DE4X5_CLR_PROM 0x04 /* Clear Promiscuous Mode */
+/* 0x03 and 0x04 were used before and are obsoleted now. Don't use them. */
#define DE4X5_SAY_BOO 0x05 /* Say "Boo!" to the kernel log file */
#define DE4X5_GET_MCA 0x06 /* Get a multicast address */
#define DE4X5_SET_MCA 0x07 /* Set a multicast address */