| リビジョン | 98c243bf09024ce2de637c86d30b549019d6a112 (tree) |
|---|---|
| 日時 | 2008-09-22 13:28:27 |
| 作者 | Willy Tarreau <w@1wt....> |
| コミッター | Willy Tarreau |
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>
arch/i386/kernel/dmi_scan.c (diff)| @@ -524,6 +524,7 @@ static __init int disable_acpi_pci(struct dmi_blacklist *d) | ||
| 524 | 524 | */ |
| 525 | 525 | |
| 526 | 526 | |
| 527 | +#ifdef CONFIG_VT | |
| 527 | 528 | /* IBM bladeservers have a USB console switch. The keyboard type is USB |
| 528 | 529 | * and the hardware does not have a console keyboard. We disable the |
| 529 | 530 | * 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) | ||
| 538 | 539 | keyboard_controller_present = 0; |
| 539 | 540 | return 0; |
| 540 | 541 | } |
| 542 | +#endif | |
| 541 | 543 | |
| 542 | 544 | /* |
| 543 | 545 | * This will be expanded over time to force things like the APM |
| @@ -825,7 +827,8 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ | ||
| 825 | 827 | MATCH(DMI_SYS_VENDOR, "IBM"), |
| 826 | 828 | NO_MATCH, NO_MATCH, NO_MATCH |
| 827 | 829 | } }, |
| 828 | - /* | |
| 830 | +#ifdef CONFIG_VT | |
| 831 | + /* | |
| 829 | 832 | * IBM Bladeservers |
| 830 | 833 | */ |
| 831 | 834 |
| @@ -834,6 +837,7 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ | ||
| 834 | 837 | MATCH(DMI_BOARD_NAME, "Server Blade"), |
| 835 | 838 | NO_MATCH, NO_MATCH |
| 836 | 839 | } }, |
| 840 | +#endif | |
| 837 | 841 | |
| 838 | 842 | #ifdef CONFIG_ACPI_BOOT |
| 839 | 843 | /* |
Linux Kernel Documents
Fork