• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: Commit

2.4.36-stable kernel tree


Commit MetaInfo

Revision98c243bf09024ce2de637c86d30b549019d6a112 (tree)
Zeit2008-09-22 13:28:27
AutorWilly Tarreau <w@1wt....>
CommiterWilly Tarreau

Log Message

x86 would not build without CONFIG_VT

I've been using this patch for a while without noticing it never
went into mainline. It is required to build i386 without CONFIG_VT.

Signed-off-by: Willy Tarreau <w@1wt.eu>

Ändern Zusammenfassung

Diff

--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -524,6 +524,7 @@ static __init int disable_acpi_pci(struct dmi_blacklist *d)
524524 */
525525
526526
527+#ifdef CONFIG_VT
527528 /* IBM bladeservers have a USB console switch. The keyboard type is USB
528529 * and the hardware does not have a console keyboard. We disable the
529530 * console keyboard so the kernel does not try to initialize one and
@@ -538,6 +539,7 @@ static __init int disable_console_keyboard(struct dmi_blacklist *d)
538539 keyboard_controller_present = 0;
539540 return 0;
540541 }
542+#endif
541543
542544 /*
543545 * This will be expanded over time to force things like the APM
@@ -825,7 +827,8 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
825827 MATCH(DMI_SYS_VENDOR, "IBM"),
826828 NO_MATCH, NO_MATCH, NO_MATCH
827829 } },
828- /*
830+#ifdef CONFIG_VT
831+ /*
829832 * IBM Bladeservers
830833 */
831834
@@ -834,6 +837,7 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
834837 MATCH(DMI_BOARD_NAME, "Server Blade"),
835838 NO_MATCH, NO_MATCH
836839 } },
840+#endif
837841
838842 #ifdef CONFIG_ACPI_BOOT
839843 /*
Show on old repository browser