PPC32: Minor fixups to the Motorola Sandpoint platform.

arch/ppc/platforms/sandpoint.c

@@ -356,6 +356,21 @@ sandpoint_setup_arch(void)
 	SANDPOINT_87308_CFG_OUTB(0x30, 0x01);				\
 }
 
+/*
+ * Fix IDE interrupts.
+ */
+static int __init
+sandpoint_fix_winbond_83553(void)
+{
+	/* Make all 8259 interrupt level sensitive */
+	outb(0xf8, 0x4d0);
+	outb(0xde, 0x4d1);
+
+	return 0;
+}
+
+arch_initcall(sandpoint_fix_winbond_83553);
+
 /*
  * Initialize the ISA devices on the Nat'l PC87308VUL SuperIO chip.
  */
@@ -391,21 +406,6 @@ sandpoint_setup_natl_87308(void)
 
 arch_initcall(sandpoint_setup_natl_87308);
 
-/*
- * Fix IDE interrupts.
- */
-static int __init
-sandpoint_fix_winbond_83553(void)
-{
-	/* Make all 8259 interrupt level sensitive */
-	outb(0xf8, 0x4d0);
-	outb(0xde, 0x4d1);
-
-	return 0;
-}
-
-arch_initcall(sandpoint_fix_winbond_83553);
-
 static int __init
 sandpoint_request_io(void)
 {

arch/ppc/platforms/sandpoint.h

@@ -61,9 +61,9 @@
 #define UART_CLK			1843200
 
 #ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST|ASYNC_AUTO_IRQ)
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_AUTO_IRQ)
 #else
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST)
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF)
 #endif
 
 #define STD_SERIAL_PORT_DFNS \