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

[Ben Hutchings]

Author: benh
Date: Tue Jul 13 23:26:01 2010
New Revision: 15985

Log:
viafb: Add transitive dependencies via gpiolib

Fix the FTBFS for alpha, ia64 and most mips/mipsel flavours.
Revert the explicit config change for ia64.

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/viafb-Add-transitive-dependencies-via-gpiolib.patch
   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/config/ia64/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Jul 13 13:02:20 2010	(r15984)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jul 13 23:26:01 2010	(r15985)
@@ -1,7 +1,8 @@
 linux-2.6 (2.6.35~rc5-1~experimental.2) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
-  * [ia64] Disable FB_VIA; gpiolib cannot be built for ia64
+  * [alpha, ia64, mips, mipsel except loongson2f] Disable FB_VIA; it now
+    depends on GPIOLIB which is not available on these architectures
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Jul 2010 14:01:16 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Tue Jul 13 13:02:20 2010	(r15984)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Tue Jul 13 23:26:01 2010	(r15985)
@@ -695,7 +695,6 @@
 CONFIG_FB_SIS=m
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-# CONFIG_FB_VIA is not set
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
 CONFIG_FB_VOODOO1=m

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/viafb-Add-transitive-dependencies-via-gpiolib.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/viafb-Add-transitive-dependencies-via-gpiolib.patch	Tue Jul 13 23:26:01 2010	(r15985)
@@ -0,0 +1,28 @@
+From 98084fc0950600f2d9f22356fc4e16ced03d72f6 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 14 Jul 2010 00:09:23 +0100
+Subject: [PATCH] viafb: Add transitive dependencies via gpiolib
+
+FB_VIA now selects GPIOLIB, but that is not available on all
+architectures.  Change FB_VIA dependencies to include GPIOLIB
+dependencies.
+---
+ drivers/video/Kconfig |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
+index 3d94a14..bc4534d 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 && (ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB)
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+-- 
+1.7.1
+

Added: dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Tue Jul 13 23:26:01 2010	(r15985)
@@ -0,0 +1 @@
++ bugfix/all/viafb-Add-transitive-dependencies-via-gpiolib.patch