[kernel] r7428 - in dists/trunk/linux-2.6/debian: . arch/powerpc

[Sven Luther]

Author: luther
Date: Sun Sep 17 20:26:21 2006
New Revision: 7428

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
   dists/trunk/linux-2.6/debian/changelog

Log:
The sisfb framebuffer device is now builtin on powerpc, except for the apus and miboot flavours.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Sun Sep 17 20:26:21 2006
@@ -886,7 +886,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	Sun Sep 17 20:26:21 2006
@@ -163,3 +163,4 @@
 # CONFIG_BLZ1230_SCSI is not set
 # CONFIG_BLZ2060_SCSI is not set
 # CONFIG_IPMI_HANDLER is not set
+# CONFIG_FB_SIS is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	Sun Sep 17 20:26:21 2006
@@ -84,3 +84,5 @@
 CONFIG_FB_IMSTT=y
 # CONFIG_PPC64 is not set
 CONFIG_CLASSIC32=y
+CONFIG_FB_SIS=m
+

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Sep 17 20:26:21 2006
@@ -15,6 +15,7 @@
 
   [ 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.