diff options
| author | Frederik Schüler <fs@debian.org> | 2006-08-18 22:20:23 +0000 |
|---|---|---|
| committer | Frederik Schüler <fs@debian.org> | 2006-08-18 22:20:23 +0000 |
| commit | e67ad292c67344f11521d83ebda80a3919bad988 (patch) | |
| tree | 393f78f2948c290b50319343793d0919cfc817f2 | |
| parent | d787508c26bfcf0447867df8ab125e9846832973 (diff) | |
| download | kernel_replicant_linux-e67ad292c67344f11521d83ebda80a3919bad988.tar.gz kernel_replicant_linux-e67ad292c67344f11521d83ebda80a3919bad988.tar.bz2 kernel_replicant_linux-e67ad292c67344f11521d83ebda80a3919bad988.zip | |
Activate CONFIG_R8169_VLAN on amd64
svn path=/dists/sid/linux-2.6/; revision=7192
| -rw-r--r-- | debian/arch/amd64/config.amd64 | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/arch/amd64/config.amd64 b/debian/arch/amd64/config.amd64 index 9f760245d97a..a826738f93ec 100644 --- a/debian/arch/amd64/config.amd64 +++ b/debian/arch/amd64/config.amd64 @@ -7,7 +7,7 @@ CONFIG_NUMA=y CONFIG_HAVE_DEC_LOCK=y CONFIG_NR_CPUS=32 # CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_R8169_VLAN is not set +CONFIG_R8169_VLAN=y CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_MAVEN=m # CONFIG_SOUND_AWE32_SYNTH is not set diff --git a/debian/changelog b/debian/changelog index 21edfb9c1e8a..a17cdc3eb286 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,7 +23,10 @@ linux-2.6 (2.6.17-7) UNRELEASED; urgency=low - powerpc: Clear HID0 attention enable on PPC970 at boot time (CVE-2006-4093) - -- maximilian attems <maks@sternwelten.at> Fri, 18 Aug 2006 20:25:24 +0200 + [ Frederik Schüler ] + * Activate CONFIG_R8169_VLAN on amd64. (closes: #383707) + + -- Frederik Schüler <fs@debian.org> Sat, 19 Aug 2006 00:19:31 +0200 linux-2.6 (2.6.17-6) unstable; urgency=low |