diff options
| author | Frederik Schüler <fs@debian.org> | 2006-08-23 13:55:55 +0000 |
|---|---|---|
| committer | Frederik Schüler <fs@debian.org> | 2006-08-23 13:55:55 +0000 |
| commit | 6f26b6251bcd3f27b88bab8ec679a21ac7fe8fab (patch) | |
| tree | abc04c814e84119999652829ca26f0582aba7e4e | |
| parent | e1b28fea306ce97006bcf7a17c43e4284a3ce147 (diff) | |
| download | kernel_replicant_linux-6f26b6251bcd3f27b88bab8ec679a21ac7fe8fab.tar.gz kernel_replicant_linux-6f26b6251bcd3f27b88bab8ec679a21ac7fe8fab.tar.bz2 kernel_replicant_linux-6f26b6251bcd3f27b88bab8ec679a21ac7fe8fab.zip | |
Activate EFI boot support on i386.
svn path=/dists/sid/linux-2.6/; revision=7232
| -rw-r--r-- | debian/arch/i386/config | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/arch/i386/config b/debian/arch/i386/config index bc3a5da8707c..1aaf3a32018a 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -44,7 +44,6 @@ CONFIG_X86_CPUID=m CONFIG_EDD=m # CONFIG_HIGHMEM64G is not set CONFIG_MTRR=y -# CONFIG_EFI is not set CONFIG_REGPARM=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set @@ -1797,3 +1796,6 @@ CONFIG_EDAC_R82600=m CONFIG_CLEAN_COMPILE=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y +CONFIG_EFI_VARS=y +CONFIG_BOOT_IOREMAP=y +CONFIG_EFI=y diff --git a/debian/changelog b/debian/changelog index 089455d3192a..77d86f252a82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,9 +9,6 @@ linux-2.6 (2.6.17-7) UNRELEASED; urgency=low * mipsel/r5k-cobalt: Increase 8250 NR_UARTS and RUNTIME_UARTS to 4. * mipsel/r5k-cobalt: Fix MAC detection problem on Qube 2700. - [ Kyle McMartin ] - * Apply patch to fix pa8800 (mostly...) - [ Bastian Blank ] * Update vserver patch to 2.0.2-rc29. * Add stable release 2.6.17.10: @@ -27,6 +24,7 @@ linux-2.6 (2.6.17-7) UNRELEASED; urgency=low [ Frederik Schüler ] * Activate CONFIG_R8169_VLAN on amd64. (closes: #383707) + * Activate EFI boot support on i386. (closes: #381951) [ dann frazier ] * Include module.lds in headers package if it exists. (closes: #342246) |