input: Print a warning message when PnP fails to find an i8042

       controller.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

drivers/input/serio/i8042-x86ia64io.h

@@ -191,7 +191,17 @@ static int i8042_pnp_init(void)
 	if ((result_aux = pnp_register_driver(&i8042_pnp_aux_driver)) >= 0)
 		i8042_pnp_aux_registered = 1;
 
-	if (result_kbd > 0 || result_aux > 0) {
+	if (result_kbd <= 0 && result_aux <= 0) {
+		i8042_pnp_exit();
+#ifdef CONFIG_PNPACPI
+		if (!acpi_disabled) {
+			printk(KERN_INFO "PNP: No PS/2 (keyboard/mouse) controller found.\n");
+			return -ENODEV;
+		}
+#endif
+		printk(KERN_WARNING "PNP: No PS/2 controller found. Probing ports directly.\n");
+		return 0;
+	}
 
 	if (((i8042_pnp_data_reg & ~0xf) == (i8042_data_reg & ~0xf) &&
 	      i8042_pnp_data_reg != i8042_data_reg) || !i8042_pnp_data_reg) {
@@ -229,15 +239,6 @@ static int i8042_pnp_init(void)
 		i8042_pnp_kbd_name, (result_kbd > 0 || result_aux > 0) ? "," : "", i8042_pnp_aux_name,
 		i8042_data_reg, i8042_command_reg, i8042_kbd_irq,
 		(result_aux > 0) ? "," : "", i8042_aux_irq);
-	} 
-
-	else {
-		i8042_pnp_exit();
-#ifdef CONFIG_PNPACPI
-		if (!acpi_disabled)
-			return -ENODEV;
-#endif
-	}
 
 	return 0;
 }