]> git.baikalelectronics.ru Git - 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)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Apr 2021 23:10:36 +0000 (16:10 -0700)
commit61587d54d7b99bd257f394afea283bc8cdcd57db
treea5dfcc0f7941e0d9de4c84a2fe40c89d12129a62
parent2fba318b240442dea1abae64d80468d85d0300f3
csky: change a Kconfig symbol name to fix e1000 build error

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>
arch/csky/Kconfig
arch/csky/include/asm/page.h