[PATCH] staging: comedi: ni_at_ao: fix namespace clash of 'RSI' define

H Hartley Sweeten hsweeten at visionengravers.com
Mon Sep 30 16:26:38 UTC 2013


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 at visionengravers.com>
Reported-by: Fengguang Wu <fengguang.wu at intel.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/ni_at_ao.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c
index 4e4b227..3545d29 100644
--- a/drivers/staging/comedi/drivers/ni_at_ao.c
+++ b/drivers/staging/comedi/drivers/ni_at_ao.c
@@ -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 */
 
-- 
1.8.3.2



More information about the devel mailing list