diff options
| author |   Heiko Carstens <heiko.carstens@de.ibm.com> | 2010-08-12 01:58:27 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-08-12 16:04:22 -0700 |
| commit | 319cb083cc3a13a168dea0da00e11e52beb5043f (patch) | |
| tree | 71dc868971ea51a65c418c07d2dc8bed70a7718f /drivers/s390/net/claw.h | |
| parent | phylib: available for any speed ethernet (diff) | |
| download | linux-dev-319cb083cc3a13a168dea0da00e11e52beb5043f.tar.xz linux-dev-319cb083cc3a13a168dea0da00e11e52beb5043f.zip | |
claw: rename READ/WRITE defines to avoid redefinitions
READ/WRITE seems to be a bit too generic for defines in a device driver.
Just rename them to READ_CHANNEL/WRITE_CHANNEL which should suffice.
Fixes this:
In file included from drivers/s390/net/claw.c:93:
drivers/s390/net/claw.h:78:1: warning: "WRITE" redefined
In file included from /home2/heicarst/linux-2.6/arch/s390/include/asm/debug.h:12,
from drivers/s390/net/claw.c:68:
include/linux/fs.h:156:1: warning: this is the location of the previous definition
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/s390/net/claw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h index 46d59a13db12..1bc5904df19f 100644 --- a/drivers/s390/net/claw.h +++ b/drivers/s390/net/claw.h @@ -74,8 +74,8 @@ #define MAX_ENVELOPE_SIZE 65536 #define CLAW_DEFAULT_MTU_SIZE 4096 #define DEF_PACK_BUFSIZE 32768 -#define READ 0 -#define WRITE 1 +#define READ_CHANNEL 0 +#define WRITE_CHANNEL 1 #define TB_TX 0 /* sk buffer handling in process */ #define TB_STOP 1 /* network device stop in process */ |