diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-08-05 15:14:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 11:57:48 -0400 |
| commit | 453c3e478e94004606b394b9ea57de71094e7c6a (patch) | |
| tree | aa195bc949f1b87cd0cb087eade66b9485b0886c | |
| parent | 64e0cc38b69b8d43ab9793f50e4bb09cea0e6bb9 (diff) | |
[PATCH] eicon: fix define conflict with ptrace
* MODE_MASK is unused in eicon driver.
* Conflicts with a ptrace stuff on arm.
drivers/isdn/hardware/eicon/divasync.h:259:1: warning: "MODE_MASK" redefined
include2/asm/ptrace.h:48:1: warning: this is the location of the previous definition
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Acked-by: Armin Schindler <armin@melware.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/isdn/hardware/eicon/divasync.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h index 0a5be7f969f2..af3eb9e795b5 100644 --- a/drivers/isdn/hardware/eicon/divasync.h +++ b/drivers/isdn/hardware/eicon/divasync.h | |||
| @@ -256,7 +256,6 @@ typedef struct | |||
| 256 | #define NO_ORDER_CHECK_MASK 0x00000010 | 256 | #define NO_ORDER_CHECK_MASK 0x00000010 |
| 257 | #define LOW_CHANNEL_MASK 0x00000020 | 257 | #define LOW_CHANNEL_MASK 0x00000020 |
| 258 | #define NO_HSCX30_MASK 0x00000040 | 258 | #define NO_HSCX30_MASK 0x00000040 |
| 259 | #define MODE_MASK 0x00000080 | ||
| 260 | #define SET_BOARD 0x00001000 | 259 | #define SET_BOARD 0x00001000 |
| 261 | #define SET_CRC4 0x00030000 | 260 | #define SET_CRC4 0x00030000 |
| 262 | #define SET_L1_TRISTATE 0x00040000 | 261 | #define SET_L1_TRISTATE 0x00040000 |