From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 30 Sep 2013 16:26:38 +0000 (-0700)
Subject: staging: comedi: ni_at_ao: fix namespace clash of 'RSI' define
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~62^2~552
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78b4c76b5f1371c6161f4d5f9f16e061d69170ae;p=pandora-kernel.git

staging: comedi: ni_at_ao: fix namespace clash of 'RSI' define

As pointed out by Fengguang Wu, the RSI define in this driver clashes
with the one in arch/x86/include/uapi/asm/ptrace-abi.h.

This define isn't currently used by the driver so just rename it to fix
the clash.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed