[kernel] r7430 - in dists/sid/linux-2.6/debian: . arch/powerpc

[Bastian Blank]

Author: waldi
Date: Sun Sep 17 20:34:14 2006
New Revision: 7430

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

Log:
Revert r7397. Known as abi changing and not fixed.


Modified: dists/sid/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config	Sun Sep 17 20:34:14 2006
@@ -889,7 +889,7 @@
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
 CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=y
+CONFIG_FB_SIS=m
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m

Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config.apus	Sun Sep 17 20:34:14 2006
@@ -168,5 +168,3 @@
 # 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/sid/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	Sun Sep 17 20:34:14 2006
@@ -84,4 +84,3 @@
 CONFIG_FB_IMSTT=y
 # CONFIG_PPC64 is not set
 CONFIG_CLASSIC32=y
-CONFIG_FB_SIS=m

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Sep 17 20:34:14 2006
@@ -1,15 +1,15 @@
 linux-2.6 (2.6.17-10) UNRELEASED; urgency=low
 
   [ Sven Luther ]
-  * [powerpc] now builtin sisfb, so sis/xgi users get a framebuffer device.
   * [powerpc] prom-init patch, to work around broken pegasos isa ranges.
   * [powerpc] added disabling of the serial driver on powermacs, courtesy of
     Mark Hymers.
+
   [ Jurij Smakov ]
   * Add vserver subarch and vserver-sparc64 flavor on sparc.
     (Closes: #386656)
 
- -- Sven Luther <sven at tael.powerlinux.fr>  Wed, 13 Sep 2006 19:12:19 +0200
+ -- Bastian Blank <waldi at debian.org>  Sun, 17 Sep 2006 23:30:50 +0200
 
 linux-2.6 (2.6.17-9) unstable; urgency=medium