Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[~andy/linux] / drivers / parport / parport_pc.c

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index bc8ce48f07781f00dccc0c856194926562af9cc3..f330338c2f2231b0af7c603447428862ce8a4f8f 100644 (file)
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1621,7 +1621,7 @@ static void __devinit detect_and_report_it87(void)
        u8 origval, r;
        if (verbose_probing)
                printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n");
-       if (!request_region(0x2e, 2, __func__))
+       if (!request_muxed_region(0x2e, 2, __func__))
                return;
        origval = inb(0x2e);            /* Save original value */
        outb(0x87, 0x2e);