Index: linux/drivers/char/watchdog/w83627hf_wdt.c
===================================================================
--- linux.orig/drivers/char/watchdog/w83627hf_wdt.c
+++ linux/drivers/char/watchdog/w83627hf_wdt.c
@@ -75,28 +75,28 @@ static void
 w83627hf_select_wd_register(void)
 {
 	unsigned char c;
-	outb_p(0x87, WDT_EFER); /* Enter extended function mode */
-	outb_p(0x87, WDT_EFER); /* Again according to manual */
+	outb(0x87, WDT_EFER); /* Enter extended function mode */
+	outb(0x87, WDT_EFER); /* Again according to manual */
 
 	outb(0x20, WDT_EFER); 	/* check chip version	*/
 	c = inb(WDT_EFDR);
 	if (c == 0x82) {	/* W83627THF 		*/
-		outb_p(0x2b, WDT_EFER); /* select GPIO3 */
-		c = ((inb_p(WDT_EFDR) & 0xf7) | 0x04); /* select WDT0 */
-		outb_p(0x2b, WDT_EFER);
-		outb_p(c, WDT_EFDR);	/* set GPIO3 to WDT0 */
+		outb(0x2b, WDT_EFER); /* select GPIO3 */
+		c = ((inb(WDT_EFDR) & 0xf7) | 0x04); /* select WDT0 */
+		outb(0x2b, WDT_EFER);
+		outb(c, WDT_EFDR);	/* set GPIO3 to WDT0 */
 	}
 
-	outb_p(0x07, WDT_EFER); /* point to logical device number reg */
-	outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */
-	outb_p(0x30, WDT_EFER); /* select CR30 */
-	outb_p(0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
+	outb(0x07, WDT_EFER); /* point to logical device number reg */
+	outb(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */
+	outb(0x30, WDT_EFER); /* select CR30 */
+	outb(0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
 }
 
 static void
 w83627hf_unselect_wd_register(void)
 {
-	outb_p(0xAA, WDT_EFER); /* Leave extended function mode */
+	outb(0xAA, WDT_EFER); /* Leave extended function mode */
 }
 
 /* tyan motherboards seem to set F5 to 0x4C ?
@@ -108,16 +108,16 @@ w83627hf_init(void)
 
 	w83627hf_select_wd_register();
 
-	outb_p(0xF6, WDT_EFER); /* Select CRF6 */
-	t=inb_p(WDT_EFDR);      /* read CRF6 */
+	outb(0xF6, WDT_EFER); /* Select CRF6 */
+	t=inb(WDT_EFDR);      /* read CRF6 */
 	if (t != 0) {
 		printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
-		outb_p(timeout, WDT_EFDR);    /* Write back to CRF6 */
+		outb(timeout, WDT_EFDR);    /* Write back to CRF6 */
 	}
-	outb_p(0xF5, WDT_EFER); /* Select CRF5 */
-	t=inb_p(WDT_EFDR);      /* read CRF5 */
+	outb(0xF5, WDT_EFER); /* Select CRF5 */
+	t=inb(WDT_EFDR);      /* read CRF5 */
 	t&=~0x0C;               /* set second mode & disable keyboard turning off watchdog */
-	outb_p(t, WDT_EFDR);    /* Write back to CRF5 */
+	outb(t, WDT_EFDR);    /* Write back to CRF5 */
 
 	w83627hf_unselect_wd_register();
 }
@@ -129,8 +129,8 @@ wdt_ctrl(int timeout)
 	
 	w83627hf_select_wd_register();
 
-	outb_p(0xF6, WDT_EFER);    /* Select CRF6 */
-	outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF6 */
+	outb(0xF6, WDT_EFER);    /* Select CRF6 */
+	outb(timeout, WDT_EFDR); /* Write Timeout counter to CRF6 */
 
 	w83627hf_unselect_wd_register();