VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2018-10-26 14:36:21 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2018-10-26 14:36:21 -0700 commit: 685f7e4f161425b137056abe35ba8ef7b669d83d parent: c7a2c49ea6c9eebbe44ff2c08b663b2905ee2c13

Commit Summary:

Merge tag 'powerpc-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Diffstat:

1 file changed, 1 insertion, 1 deletion

diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 9671ded549f0..b31abe35ed2c 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -230,7 +230,7 @@ static int electra_cf_probe(struct platform_device *ofdev)
 
 	if (!cf->mem_base || !cf->io_virt || !cf->gpio_base ||
 	    (__ioremap_at(io.start, cf->io_virt, cf->io_size,
-		  pgprot_val(pgprot_noncached(__pgprot(0)))) == NULL)) {
+			  pgprot_noncached(PAGE_KERNEL)) == NULL)) {
 		dev_err(device, "can't ioremap ranges\n");
 		status = -ENOMEM;
 		goto fail1;