]> err.no Git - linux-2.6/commit
[PATCH] eicon: fix define conflict with ptrace
authorAlexey Dobriyan <adobriyan@gmail.com>
Sat, 5 Aug 2006 19:14:43 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 6 Aug 2006 15:57:48 +0000 (08:57 -0700)
commit453c3e478e94004606b394b9ea57de71094e7c6a
treeaa195bc949f1b87cd0cb087eade66b9485b0886c
parent64e0cc38b69b8d43ab9793f50e4bb09cea0e6bb9
[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>
drivers/isdn/hardware/eicon/divasync.h