diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 06:08:27 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 06:08:27 -0400 |
| commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
| tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/ia64/configs/sn2_defconfig | |
| parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
Merge ../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 487d2e36b0a6..c05613980300 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
| @@ -99,7 +99,7 @@ CONFIG_ACPI_DEALLOCATE_IRQ=y | |||
| 99 | # Firmware Drivers | 99 | # Firmware Drivers |
| 100 | # | 100 | # |
| 101 | CONFIG_EFI_VARS=y | 101 | CONFIG_EFI_VARS=y |
| 102 | # CONFIG_EFI_PCDP is not set | 102 | CONFIG_EFI_PCDP=y |
| 103 | CONFIG_BINFMT_ELF=y | 103 | CONFIG_BINFMT_ELF=y |
| 104 | # CONFIG_BINFMT_MISC is not set | 104 | # CONFIG_BINFMT_MISC is not set |
| 105 | 105 | ||
| @@ -650,7 +650,7 @@ CONFIG_MMTIMER=y | |||
| 650 | # | 650 | # |
| 651 | # Console display driver support | 651 | # Console display driver support |
| 652 | # | 652 | # |
| 653 | # CONFIG_VGA_CONSOLE is not set | 653 | CONFIG_VGA_CONSOLE=y |
| 654 | CONFIG_DUMMY_CONSOLE=y | 654 | CONFIG_DUMMY_CONSOLE=y |
| 655 | 655 | ||
| 656 | # | 656 | # |