]> git.ipfire.org Git - people/arne_f/kernel.git/commit
csky: change a Kconfig symbol name to fix e1000 build error
authorRandy Dunlap <rdunlap@infradead.org>
Fri, 16 Apr 2021 22:46:03 +0000 (15:46 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Apr 2021 11:41:50 +0000 (13:41 +0200)
commit0f7a140e43ca7acd3202c9ad20456cbba918e681
tree141ef1c360d839ebaa5f7748e400e1ffa0730c18
parent3d19a9e8b8233438d41afc03f0cd226ae74dd953
csky: change a Kconfig symbol name to fix e1000 build error

[ Upstream commit d199161653d612b8fb96ac51bfd5b2d2782ecef3 ]

e1000's #define of CONFIG_RAM_BASE conflicts with a Kconfig symbol in
arch/csky/Kconfig.

The symbol in e1000 has been around longer, so change arch/csky/ to use
DRAM_BASE instead of RAM_BASE to remove the conflict.  (although e1000
is also a 2-line change)

Link: https://lkml.kernel.org/r/20210411055335.7111-1-rdunlap@infradead.org
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Acked-by: Guo Ren <guoren@kernel.org>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/csky/Kconfig
arch/csky/include/asm/page.h