From d326510b77501935b6dfc5d5a141bc26cd7798cc Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 20 May 2007 12:18:13 +0000 Subject: [PATCH] * debian/arch/powerpc/config: Disable prep. * debian/arch/powerpc/defines: Unset PMAC_APM_EMU. * debian/changelog: Update. svn path=/dists/trunk/linux-2.6/; revision=8614 --- debian/arch/powerpc/config | 2 +- debian/arch/powerpc/defines | 2 +- debian/changelog | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 634cc2ca5..2b0084431 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -245,7 +245,7 @@ CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_PMU=y CONFIG_PMAC_PBOOK=y -CONFIG_PMAC_APM_EMU=m +# CONFIG_PMAC_APM_EMU is not set CONFIG_PMAC_BACKLIGHT=y CONFIG_PMAC_BACKLIGHT_LEGACY=y CONFIG_ADB_MACIO=y diff --git a/debian/arch/powerpc/defines b/debian/arch/powerpc/defines index b003103ac..0f7936215 100644 --- a/debian/arch/powerpc/defines +++ b/debian/arch/powerpc/defines @@ -4,7 +4,7 @@ flavours: powerpc-smp powerpc-miboot powerpc64 - prep +# prep # apus kernel-header-dirs: powerpc ppc m68k kernel-arch: powerpc diff --git a/debian/changelog b/debian/changelog index 9e028f65a..7c3872e47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low - * + * [powerpc]: Disable prep. + * [powerpc]: Disable apm emulation. - -- Bastian Blank Sun, 20 May 2007 08:56:44 +0200 + -- Bastian Blank Sun, 20 May 2007 14:16:47 +0200 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low