[kernel] r15984 - in dists/trunk/linux-2.6/debian: . config/ia64

[Ben Hutchings]

Author: benh
Date: Tue Jul 13 13:02:20 2010
New Revision: 15984

Log:
[ia64] Disable FB_VIA; gpiolib cannot be built for ia64

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 04:33:35 2010	(r15983)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jul 13 13:02:20 2010	(r15984)
@@ -1,3 +1,10 @@
+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
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Jul 2010 14:01:16 +0100
+
 linux-2.6 (2.6.35~rc5-1~experimental.1) experimental; urgency=low
 
   * New upstream release candidate

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Tue Jul 13 04:33:35 2010	(r15983)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Tue Jul 13 13:02:20 2010	(r15984)
@@ -695,6 +695,7 @@
 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