diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-09-30 09:26:38 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 18:33:13 -0700 |
| commit | 78b4c76b5f1371c6161f4d5f9f16e061d69170ae (patch) | |
| tree | 60d4b32bbab926317bddff66cff80bf3da21d719 | |
| parent | Merge 3.12-rc3 into staging-next (diff) | |
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_at_ao.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c index 4e4b227e091f..3545d294c4ae 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 */ |