Use i386 flavour configuration files regardless of the featureset

svn path=/dists/trunk/linux-2.6/; revision=14979

debian/changelog

@@ -33,6 +33,8 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
     (CVE-2009-3939)
   * e1000,e1000e: Discard all fragments of received over-length packets
     (CVE-2009-4536, CVE-2009-4538)
+  * Enable the '686' configuration options in '686-vserver' packages and
+    the '686-bigmem' configuration options in '686-bigmem-vserver' packages
 
   [ Ian Campbell ]
   * xen: Enable up to 32G of guest memory on i386.

debian/config/i386/defines

@@ -22,6 +22,7 @@ hardware-long: PCs with a 486, Pentium or compatible processor
 [486_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.486
 
 [686_description]
 hardware: modern PCs
@@ -30,6 +31,7 @@ hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core o
 [686_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.686
 recommends: libc6-i686
 
 [686-bigmem_description]
@@ -40,6 +42,7 @@ parts: xen
 [686-bigmem_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.686-bigmem
 recommends: libc6-i686
 
 [amd64_description]