diff --git a/[refs] b/[refs] index c3dac0c20b42..756ee0c90d6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15ed6cc0ba6b7beaf31c6756b0c838188800051b +refs/heads/master: cd989b3a8c30148c872c7677c7a0415584f1658c diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c index ba795c757db0..e61939d3331d 100644 --- a/trunk/drivers/char/cyclades.c +++ b/trunk/drivers/char/cyclades.c @@ -4556,7 +4556,7 @@ static int __init cy_detect_isa(void) return nboard; /* probe for CD1400... */ - cy_isa_address = ioremap(isa_address, CyISA_Ywin); + cy_isa_address = ioremap_nocache(isa_address, CyISA_Ywin); if (cy_isa_address == NULL) { printk(KERN_ERR "Cyclom-Y/ISA: can't remap base " "address\n");