git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
[safe/jmp/linux-2.6]
/
drivers
/
net
/
e1000
/
e1000_osdep.h
diff --git
a/drivers/net/e1000/e1000_osdep.h
b/drivers/net/e1000/e1000_osdep.h
index
3b7eb7c
..
10af742
100644
(file)
--- a/
drivers/net/e1000/e1000_osdep.h
+++ b/
drivers/net/e1000/e1000_osdep.h
@@
-48,8
+48,6
@@
typedef enum {
TRUE = 1
} boolean_t;
TRUE = 1
} boolean_t;
-#define MSGOUT(S, A, B) printk(KERN_DEBUG S "\n", A, B)
-
#ifdef DBG
#define DEBUGOUT(S) printk(KERN_DEBUG S "\n")
#define DEBUGOUT1(S, A...) printk(KERN_DEBUG S "\n", A)
#ifdef DBG
#define DEBUGOUT(S) printk(KERN_DEBUG S "\n")
#define DEBUGOUT1(S, A...) printk(KERN_DEBUG S "\n", A)
@@
-58,7
+56,7
@@
typedef enum {
#define DEBUGOUT1(S, A...)
#endif
#define DEBUGOUT1(S, A...)
#endif
-#define DEBUGFUNC(F) DEBUGOUT(F)
+#define DEBUGFUNC(F) DEBUGOUT(F
"\n"
)
#define DEBUGOUT2 DEBUGOUT1
#define DEBUGOUT3 DEBUGOUT2
#define DEBUGOUT7 DEBUGOUT3
#define DEBUGOUT2 DEBUGOUT1
#define DEBUGOUT3 DEBUGOUT2
#define DEBUGOUT7 DEBUGOUT3
@@
-107,16
+105,16
@@
typedef enum {
#define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS)
#define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS)
-#define E1000_WRITE_ICH
8
_REG(a, reg, value) ( \
+#define E1000_WRITE_ICH
_FLASH
_REG(a, reg, value) ( \
writel((value), ((a)->flash_address + reg)))
writel((value), ((a)->flash_address + reg)))
-#define E1000_READ_ICH
8
_REG(a, reg) ( \
+#define E1000_READ_ICH
_FLASH
_REG(a, reg) ( \
readl((a)->flash_address + reg))
readl((a)->flash_address + reg))
-#define E1000_WRITE_ICH
8
_REG16(a, reg, value) ( \
+#define E1000_WRITE_ICH
_FLASH
_REG16(a, reg, value) ( \
writew((value), ((a)->flash_address + reg)))
writew((value), ((a)->flash_address + reg)))
-#define E1000_READ_ICH
8
_REG16(a, reg) ( \
+#define E1000_READ_ICH
_FLASH
_REG16(a, reg) ( \
readw((a)->flash_address + reg))
#endif /* _E1000_OSDEP_H_ */
readw((a)->flash_address + reg))
#endif /* _E1000_OSDEP_H_ */