Commit 453c3e47 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds

[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: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Acked-by: default avatarArmin Schindler <armin@melware.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 64e0cc38
...@@ -256,7 +256,6 @@ typedef struct ...@@ -256,7 +256,6 @@ typedef struct
#define NO_ORDER_CHECK_MASK 0x00000010 #define NO_ORDER_CHECK_MASK 0x00000010
#define LOW_CHANNEL_MASK 0x00000020 #define LOW_CHANNEL_MASK 0x00000020
#define NO_HSCX30_MASK 0x00000040 #define NO_HSCX30_MASK 0x00000040
#define MODE_MASK 0x00000080
#define SET_BOARD 0x00001000 #define SET_BOARD 0x00001000
#define SET_CRC4 0x00030000 #define SET_CRC4 0x00030000
#define SET_L1_TRISTATE 0x00040000 #define SET_L1_TRISTATE 0x00040000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment