Commit 78b4c76b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73b22777
...@@ -110,7 +110,7 @@ Configuration options: ...@@ -110,7 +110,7 @@ Configuration options:
#define BCD 0x01 #define BCD 0x01
#define ATAO_2_RTSISHFT 0x06 /* W 8 */ #define ATAO_2_RTSISHFT 0x06 /* W 8 */
#define RSI 0x01 #define ATAO_RTSISHFT_RSI (1 << 0)
#define ATAO_2_RTSISTRB 0x07 /* W 8 */ #define ATAO_2_RTSISTRB 0x07 /* W 8 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment