summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgb/ixgb_osdep.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-19 21:27:07 +0200
committerJeff Garzik <jeff@garzik.org>2006-09-19 21:27:07 +0200
commitf8ec473387f70d103c83ffb3ab50cb2b1380d0c0 (patch)
tree8abcae6e3e7c4692519196c26dac4a82e65753b4 /drivers/net/ixgb/ixgb_osdep.h
parentMerge branch 'master' into upstream (diff)
downloadlinux-f8ec473387f70d103c83ffb3ab50cb2b1380d0c0.tar.xz
linux-f8ec473387f70d103c83ffb3ab50cb2b1380d0c0.zip
e1000, ixgb: Remove pointless wrappers
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ixgb/ixgb_osdep.h')
-rw-r--r--drivers/net/ixgb/ixgb_osdep.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index ee982feac64d..19cb1d586dec 100644
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -40,18 +40,6 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
-#ifndef msec_delay
-#define msec_delay(x) do { if(in_interrupt()) { \
- /* Don't mdelay in interrupt context! */ \
- BUG(); \
- } else { \
- msleep(x); \
- } } while(0)
-#endif
-
-#define PCI_COMMAND_REGISTER PCI_COMMAND
-#define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
-
typedef enum {
#undef FALSE
FALSE = 0,