Merge 4.0-rc3 into tty-testing

This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 0 insertions, 6 deletions

diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index a62536a1be88..f85e3fb50f28 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -375,12 +375,6 @@ static int __init setup_early_printk(char *buf)
                 if (!strncmp(buf, "xen", 3))
                         early_console_register(&xenboot_console, keep);
 #endif
-#ifdef CONFIG_EARLY_PRINTK_INTEL_MID
-                if (!strncmp(buf, "hsu", 3)) {
-                        hsu_early_console_init(buf + 3);
-                        early_console_register(&early_hsu_console, keep);
-                }
-#endif
 #ifdef CONFIG_EARLY_PRINTK_EFI
                 if (!strncmp(buf, "efi", 3))
                         early_console_register(&early_efi_console, keep);