From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Sat, 5 Aug 2006 19:14:43 +0000 (-0700)
Subject: [PATCH] eicon: fix define conflict with ptrace
X-Git-Tag: v2.6.18-rc4~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=453c3e478e94004606b394b9ea57de71094e7c6a;p=pandora-kernel.git

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

Reading git-diff-tree failed