diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 1cbb9824a..7d721cb42 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -886,7 +886,7 @@ CONFIG_FB_ATY_GX=y CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m +CONFIG_FB_SIS=y CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y CONFIG_FB_NEOMAGIC=m diff --git a/debian/arch/powerpc/config.apus b/debian/arch/powerpc/config.apus index b7cc80911..381062aa5 100644 --- a/debian/arch/powerpc/config.apus +++ b/debian/arch/powerpc/config.apus @@ -163,3 +163,4 @@ CONFIG_LOGO_LINUX_MONO=y # CONFIG_BLZ1230_SCSI is not set # CONFIG_BLZ2060_SCSI is not set # CONFIG_IPMI_HANDLER is not set +# CONFIG_FB_SIS is not set diff --git a/debian/arch/powerpc/config.powerpc-miboot b/debian/arch/powerpc/config.powerpc-miboot index cfca6c60e..f02d00776 100644 --- a/debian/arch/powerpc/config.powerpc-miboot +++ b/debian/arch/powerpc/config.powerpc-miboot @@ -84,3 +84,5 @@ CONFIG_FB_VALKYRIE=y CONFIG_FB_IMSTT=y # CONFIG_PPC64 is not set CONFIG_CLASSIC32=y +CONFIG_FB_SIS=m + diff --git a/debian/changelog b/debian/changelog index c8c4662bb..7c1a9a413 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ linux-2.6 (2.6.17+2.6.18-rc7-0experimental.1) UNRELEASED; urgency=low [ Sven Luther ] * [powerpc] Enabled the -prep flavour. + * [powerpc] The sisfb framebuffer device is now builtin. [ Frederik Schüler ] * Remove obsolete options from amd64 and i386 configs.