diff options
| author | Willy Tarreau <w@1wt.eu> | 2008-09-07 12:37:51 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2008-09-07 12:41:35 +0200 |
| commit | 90e228888a59d630c8094d5d1b273b00a2c76cc0 (patch) | |
| tree | 5a4d382aa8b4de98660717ce88200d1d6a274ca3 | |
| parent | 2550a6214e1778d49ff2cbe4a636b45aec8f5310 (diff) | |
| download | linux-2.4-90e228888a59d630c8094d5d1b273b00a2c76cc0.tar.gz | |
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>
| -rw-r--r-- | arch/i386/kernel/dmi_scan.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c index 07c6d94be5278..9c27ca2434e85 100644 --- 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) */ +#ifdef CONFIG_VT /* IBM bladeservers have a USB console switch. The keyboard type is USB * and the hardware does not have a console keyboard. We disable the * 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) keyboard_controller_present = 0; return 0; } +#endif /* * This will be expanded over time to force things like the APM @@ -825,7 +827,8 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ MATCH(DMI_SYS_VENDOR, "IBM"), NO_MATCH, NO_MATCH, NO_MATCH } }, - /* +#ifdef CONFIG_VT + /* * IBM Bladeservers */ @@ -834,6 +837,7 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ MATCH(DMI_BOARD_NAME, "Server Blade"), NO_MATCH, NO_MATCH } }, +#endif #ifdef CONFIG_ACPI_BOOT /* |