Commit 453c3e47 authored Aug 05, 2006 by Alexey Dobriyan Committed by Linus Torvalds Aug 06, 2006

[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>

parent 64e0cc38

drivers/isdn/hardware/eicon/divasync.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -256,7 +256,6 @@ typedef struct
		#define NO_ORDER_CHECK_MASK 0x00000010
		#define LOW_CHANNEL_MASK 0x00000020
		#define NO_HSCX30_MASK 0x00000040
		#define MODE_MASK 0x00000080
		#define SET_BOARD 0x00001000
		#define SET_CRC4 0x00030000
		#define SET_L1_TRISTATE 0x00040000