r4386 - in dists/sid/linux-2.6/debian: . arch/alpha arch/amd64 arch/i386 arch/ia64 arch/powerpc

[Frederik Schüler]

Author: fschueler-guest
Date: 2005-10-10 19:44:41 +0000 (Mon, 10 Oct 2005)
New Revision: 4386

Modified:
   dists/sid/linux-2.6/debian/arch/alpha/config
   dists/sid/linux-2.6/debian/arch/amd64/config
   dists/sid/linux-2.6/debian/arch/amd64/defines
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/arch/ia64/config
   dists/sid/linux-2.6/debian/arch/powerpc/config
   dists/sid/linux-2.6/debian/changelog
Log:
deactivate FB_RIVA on all architectures. (closes: #333067)
[amd64] Added class and longclass descriptions for amd64 flavours.



Modified: dists/sid/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/alpha/config	2005-10-10 19:29:31 UTC (rev 4385)
+++ dists/sid/linux-2.6/debian/arch/alpha/config	2005-10-10 19:44:41 UTC (rev 4386)
@@ -1288,7 +1288,7 @@
 CONFIG_FB_TGA=m
 CONFIG_FB_NVIDIA=m
 # CONFIG_FB_NVIDIA_I2C is not set
-CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA is not set
 # CONFIG_FB_RIVA_I2C is not set
 # CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=m

Modified: dists/sid/linux-2.6/debian/arch/amd64/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config	2005-10-10 19:29:31 UTC (rev 4385)
+++ dists/sid/linux-2.6/debian/arch/amd64/config	2005-10-10 19:44:41 UTC (rev 4386)
@@ -1257,9 +1257,9 @@
 # CONFIG_FB_HGA_ACCEL is not set
 CONFIG_FB_NVIDIA=m
 # CONFIG_FB_NVIDIA_I2C is not set
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-CONFIG_FB_RIVA_DEBUG=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y

Modified: dists/sid/linux-2.6/debian/arch/amd64/defines
===================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/defines	2005-10-10 19:29:31 UTC (rev 4385)
+++ dists/sid/linux-2.6/debian/arch/amd64/defines	2005-10-10 19:44:41 UTC (rev 4386)
@@ -7,3 +7,26 @@
  em64t-p4
  em64t-p4-smp
 suggests: lilo (>= 19.1) | grub, fdutils
+
+kernel-arch: x86_64
+
+[amd64-generic]
+class: all x86-64 
+longclass: all 64bit x86-64 compatible
+
+[amd64-k8]
+class: AMD64 K8 
+longclass: 64bit AMD Athlon64, AthlonFX, Opteron 1xx and Turion64
+
+[amd64-k8-smp]
+class: AMD64 K8 SMP
+longclass: 64bit multi-processor/multi-core AMD Athlon64 X2 and Opteron 2xx/8xx
+
+[em64t-p4]
+class: Intel em64t P4
+longclass: 64bit Intel em64t Pentium4 
+
+[em64t-p4-smp]
+class: Intel em64t P4/Xeon SMP
+longclass: 64bit multi-processor/multi-core Intel em64t Pentium 4/Pentium D/Xeon
+

Modified: dists/sid/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config	2005-10-10 19:29:31 UTC (rev 4385)
+++ dists/sid/linux-2.6/debian/arch/i386/config	2005-10-10 19:44:41 UTC (rev 4386)
@@ -1460,9 +1460,9 @@
 # CONFIG_FB_HGA_ACCEL is not set
 CONFIG_FB_NVIDIA=m
 CONFIG_FB_NVIDIA_I2C=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-CONFIG_FB_RIVA_DEBUG=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_I810=m
 # CONFIG_FB_I810_GTF is not set
 CONFIG_FB_INTEL=m

Modified: dists/sid/linux-2.6/debian/arch/ia64/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config	2005-10-10 19:29:31 UTC (rev 4385)
+++ dists/sid/linux-2.6/debian/arch/ia64/config	2005-10-10 19:44:41 UTC (rev 4386)
@@ -1018,8 +1018,8 @@
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_NVIDIA=m
 CONFIG_FB_NVIDIA_I2C=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_RIVA_I2C is not set
 # CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y

Modified: dists/sid/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config	2005-10-10 19:29:31 UTC (rev 4385)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config	2005-10-10 19:44:41 UTC (rev 4386)
@@ -1008,8 +1008,8 @@
 CONFIG_FB_IMSTT=y
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_NVIDIA=y
-CONFIG_FB_RIVA=y
-CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_RIVA_I2C is not set
 # CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y

Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-10-10 19:29:31 UTC (rev 4385)
+++ dists/sid/linux-2.6/debian/changelog	2005-10-10 19:44:41 UTC (rev 4386)
@@ -8,11 +8,15 @@
   * mempolicy fix in 2.6.12-3 from upstream's 2.6.12.5 is CAN-2005-3053
   * lost-fput-in-32bit-ioctl-on-x86-64.patch in 2.6.12-7 is CAN-2005-3044
 
+  [ Frederik Schüler ]
+  * deactivate FB_RIVA on all architectures. (closes: #333067)
+  * [amd64] Added class and longclass descriptions for amd64 flavours.
+
   [ Kyle McMartin ]
   * [hppa] Oops. Fix linux-headers not including asm-parisc by adding
     headers_dirs = parisc to Makefile.inc.
 
- -- dann frazier <dannf at debian.org>  Tue, 27 Sep 2005 23:48:47 -0600
+ -- Frederik Schüler <fschueler at gmx.net>  Mon, 10 Oct 2005 21:22:40 +0200
 
 linux-2.6 (2.6.12-10) unstable; urgency=high