diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
| commit | f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d (patch) | |
| tree | f8d9d8ee821fcc9f0a8e1a8679bc622219c70e3b /arch/riscv/kernel/module.c | |
| parent | 8f4043f1253292495dbf9c8be0c1b07b4b9902b7 (diff) | |
| parent | 7f46774c6480174eb869a3c15167eafac467a6af (diff) | |
| download | kernel_replicant_linux-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.tar.gz kernel_replicant_linux-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.tar.bz2 kernel_replicant_linux-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment merge conflict in mlx5.
Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/riscv/kernel/module.c')
| -rw-r--r-- | arch/riscv/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 7dd308129b40..2872edce894d 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -141,7 +141,7 @@ static int apply_r_riscv_hi20_rela(struct module *me, u32 *location, { s32 hi20; - if (IS_ENABLED(CMODEL_MEDLOW)) { + if (IS_ENABLED(CONFIG_CMODEL_MEDLOW)) { pr_err( "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n", me->name, (long long)v, location); |