OSDN Git Service

misc: rtsx: rename SG_END macro
authorArnd Bergmann <arnd@arndb.de>
Thu, 1 Mar 2018 10:31:28 +0000 (11:31 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 1 Mar 2018 15:33:05 +0000 (08:33 -0700)
commitf16ee7c7ec0fa5f0322bd64d5ee183a28ed1ec08
tree94cf37b368867e687d43db46e3ffbf5594559100
parenta063057d7c731cffa7d10740e8ebc2970df8dbb3
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>
drivers/misc/cardreader/rtsx_pcr.c
include/linux/rtsx_pci.h