From 294fb5ca48e44c5c741f15f8ba8cad435cc1af40 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 13 Jul 2010 13:02:20 +0000 Subject: [PATCH] [ia64] Disable FB_VIA; gpiolib cannot be built for ia64 svn path=/dists/trunk/linux-2.6/; revision=15984 --- debian/changelog | 7 +++++++ debian/config/ia64/config | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 94fea135c..43f849e3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 diff --git a/debian/config/ia64/config b/debian/config/ia64/config index c9e3498b7..c11d19d85 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -695,6 +695,7 @@ CONFIG_FB_SAVAGE_I2C=y 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