[kernel] r7192 - in dists/sid/linux-2.6/debian: .

[Frederik Schüler]

Author: fs
Date: Fri Aug 18 22:20:23 2006
New Revision: 7192

Modified:
   dists/sid/linux-2.6/debian/arch/amd64/config.amd64
   dists/sid/linux-2.6/debian/changelog

Log:
Activate CONFIG_R8169_VLAN on amd64


Modified: dists/sid/linux-2.6/debian/arch/amd64/config.amd64
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config.amd64	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config.amd64	Fri Aug 18 22:20:23 2006
@@ -7,7 +7,7 @@
 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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Aug 18 22:20:23 2006
@@ -23,7 +23,10 @@
     - powerpc: Clear HID0 attention enable on PPC970 at boot time
     (CVE-2006-4093)
 
- -- maximilian attems <maks at 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 at debian.org>  Sat, 19 Aug 2006 00:19:31 +0200
 
 linux-2.6 (2.6.17-6) unstable; urgency=low