From e7fd4582056a512e7d85a045421e24d89032ef79 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 5 Jul 2007 08:48:36 +0000 Subject: [PATCH] commit patch by djpig so that hppa builds fine in trunk again. :) svn path=/dists/trunk/linux-2.6/; revision=9073 --- debian/arch/hppa/config | 4 ++++ debian/changelog | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 24e5fed76..b5d20b088 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -481,13 +481,17 @@ CONFIG_FB_STI=y # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set # CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set # CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set CONFIG_DUMMY_CONSOLE=y diff --git a/debian/changelog b/debian/changelog index 88492ea33..85195a667 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,11 +8,13 @@ linux-2.6 (2.6.22~rc7-1~experimental.1) UNRELEASED; urgency=low * Add Sempron to the k7 image description (closes: #384737) Thanks Robert Millan . * powerpc.config: Enable CONFIG_ADB_PMU_LED. + * [hppa] Disable a bunch of topconfig enabled fb devices. Thanks Frank + Lichtenheld for build fix. [ Christian T. Steigies ] * add module.lds to kernel headers - -- Christian T. Steigies Wed, 4 Jul 2007 21:52:19 +0200 + -- maximilian attems Thu, 05 Jul 2007 10:44:02 +0200 linux-2.6 (2.6.22~rc5-1~experimental.1) experimental; urgency=low