diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 21:03:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 21:03:03 -0700 |
| commit | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (patch) | |
| tree | 59cbb1af2c6de429b88818441e31963ec0aad42b /arch/ia64/configs/sn2_defconfig | |
| parent | 2949ccf9379678df66ecf2ca70ed4656159eacdd (diff) | |
| parent | 0647d8cfd40f7974335884d73deef83feeffc2a0 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/configs/sn2_defconfig')
| -rw-r--r-- | arch/ia64/configs/sn2_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 487d2e36b0a..c0561398030 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig @@ -99,7 +99,7 @@ CONFIG_ACPI_DEALLOCATE_IRQ=y # Firmware Drivers # CONFIG_EFI_VARS=y -# CONFIG_EFI_PCDP is not set +CONFIG_EFI_PCDP=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set @@ -650,7 +650,7 @@ CONFIG_MMTIMER=y # # Console display driver support # -# CONFIG_VGA_CONSOLE is not set +CONFIG_VGA_CONSOLE=y CONFIG_DUMMY_CONSOLE=y # |