diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-03-01 11:31:28 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-03-01 08:33:05 -0700 |
| commit | f16ee7c7ec0fa5f0322bd64d5ee183a28ed1ec08 (patch) | |
| tree | 94cf37b368867e687d43db46e3ffbf5594559100 /include/linux/rtsx_pci.h | |
| parent | block: Fix a race between request queue removal and the block cgroup controller (diff) | |
| download | linux-dev-f16ee7c7ec0fa5f0322bd64d5ee183a28ed1ec08.tar.xz linux-dev-f16ee7c7ec0fa5f0322bd64d5ee183a28ed1ec08.zip | |
misc: rtsx: rename SG_END macro
A change to the generic scatterlist code caused a conflict with
the rtsx card reader driver:
In file included from drivers/misc/cardreader/rtsx_pcr.c:32:
include/linux/rtsx_pci.h:40: error: "SG_END" redefined [-Werror]
This changes one instance of the driver to prefix SG_END and
related constants.
Fixes: 723fbf563a6a ("lib/scatterlist: Add SG_CHAIN and SG_END macros for LSB encodings")
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/rtsx_pci.h')
| -rw-r--r-- | include/linux/rtsx_pci.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h index 478acf6efac6..e964bbd03fc2 100644 --- a/include/linux/rtsx_pci.h +++ b/include/linux/rtsx_pci.h @@ -36,12 +36,12 @@ #define CHECK_REG_CMD 2 #define RTSX_HDBAR 0x08 -#define SG_INT 0x04 -#define SG_END 0x02 -#define SG_VALID 0x01 -#define SG_NO_OP 0x00 -#define SG_TRANS_DATA (0x02 << 4) -#define SG_LINK_DESC (0x03 << 4) +#define RTSX_SG_INT 0x04 +#define RTSX_SG_END 0x02 +#define RTSX_SG_VALID 0x01 +#define RTSX_SG_NO_OP 0x00 +#define RTSX_SG_TRANS_DATA (0x02 << 4) +#define RTSX_SG_LINK_DESC (0x03 << 4) #define RTSX_HDBCTLR 0x0C #define SDMA_MODE 0x00 #define ADMA_MODE (0x02 << 26) |