leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2013-09-30 09:26:38 -07:00 committed by Greg Kroah-Hartman
parent 73b2277718
commit 78b4c76b5f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/comedi/drivers/ni_at_ao.c
View File

@ -110,7 +110,7 @@ Configuration options:
#define BCD 0x01
#define ATAO_2_RTSISHFT 0x06 /* W 8 */
#define RSI 0x01
#define ATAO_RTSISHFT_RSI (1 << 0)
#define ATAO_2_RTSISTRB 0x07 /* W 8 */