[kernel] r15999 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Tue Jul 20 00:08:12 2010
New Revision: 15999

Log:
[!x86] Disable FB_VIA; these GPUs are only found on x86 motherboards

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/viafb-Depends-on-X86.patch
Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/viafb-Add-transitive-dependencies-via-gpiolib.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.2

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jul 18 21:43:07 2010	(r15998)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jul 20 00:08:12 2010	(r15999)
@@ -1,8 +1,7 @@
 linux-2.6 (2.6.35~rc5-1~experimental.2) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
-  * [alpha, ia64, mips, mipsel except loongson2f] Disable FB_VIA; it now
-    depends on GPIOLIB which is not available on these architectures
+  * [!x86] Disable FB_VIA; these GPUs are only found on x86 motherboards
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Jul 2010 14:01:16 +0100
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/viafb-Depends-on-X86.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/viafb-Depends-on-X86.patch	Tue Jul 20 00:08:12 2010	(r15999)
@@ -0,0 +1,27 @@
+From b994ef79fccdcf24182ea375e917ec124c3cfdfa Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 20 Jul 2010 00:31:24 +0100
+Subject: [PATCH 1/2] viafb: Depends on X86
+
+VIA UniChrome and Chrome9 GPUs only exist as Integrated Graphics
+Processors in x86 chipsets.
+---
+ drivers/video/Kconfig |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
+index 3d94a14..162a0b7 100644
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
+@@ -1505,7 +1505,7 @@ config FB_SIS_315
+ 
+ config FB_VIA
+        tristate "VIA UniChrome (Pro) and Chrome9 display support"
+-       depends on FB && PCI
++       depends on FB && PCI && X86
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+-- 
+1.7.1
+

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Sun Jul 18 21:43:07 2010	(r15998)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Tue Jul 20 00:08:12 2010	(r15999)
@@ -1 +1 @@
-+ bugfix/all/viafb-Add-transitive-dependencies-via-gpiolib.patch
++ bugfix/all/viafb-Depends-on-X86.patch