diff options
| author | Randy Dunlap <rdunlap@infradead.org> | 2021-10-04 00:56:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-27 09:32:39 +0200 |
| commit | b5216fdca0f7ac5aa7a99723e66d490fc0f786ef (patch) | |
| tree | 2012ad4ef8b7b5fc0a2719ab170c372a0a6c5162 /drivers/net/can/rcar_can.c | |
| parent | 2beaba79a9d9fdcabdd41a38eb98d97a5fb901dc (diff) | |
NIOS2: irqflags: rename a redefined register name
[ Upstream commit 4cce60f15c04d69eff6ffc539ab09137dbe15070 ]
Both arch/nios2/ and drivers/mmc/host/tmio_mmc.c define a macro
with the name "CTL_STATUS". Change the one in arch/nios2/ to be
"CTL_FSTATUS" (flags status) to eliminate the build warning.
In file included from ../drivers/mmc/host/tmio_mmc.c:22:
drivers/mmc/host/tmio_mmc.h:31: warning: "CTL_STATUS" redefined
31 | #define CTL_STATUS 0x1c
arch/nios2/include/asm/registers.h:14: note: this is the location of the previous definition
14 | #define CTL_STATUS 0
Fixes: b31ebd8055ea ("nios2: Nios2 registers")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/can/rcar_can.c')
0 files changed, 0 insertions, 0 deletions