[kernel] r11340 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Thu May  8 22:13:25 2008
New Revision: 11340

Log:
Revert "topconfig disable sis190"

build breakage was temporal, fix up.
might need trunk porting for next 2.6.25 upload too.

This reverts commit 374102b71e5b729e91c500e13f245396f5374fb1.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May  8 22:13:25 2008
@@ -16,6 +16,8 @@
   * [amd64]: Enable SCSI_DPT_I2O as 64 bit now.
   * Reenable USB_SERIAL_EDGEPORT, USB_SERIAL_EDGEPORT_TI. (closes: #480195)
   * Enable TCP_MD5SIG for BGP sessions. (closes: #443742)
+  * 2.6.25 release cycle accidentaly disabled SIS190 reenable.
+    (closes: #478773)
 
  -- maximilian attems <maks at debian.org>  Sat, 26 Apr 2008 23:11:17 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Thu May  8 22:13:25 2008
@@ -981,7 +981,7 @@
 CONFIG_IP1000=m
 CONFIG_IGB=m
 CONFIG_R8169_NAPI=y
-# CONFIG_SIS190 is not set
+CONFIG_SIS190=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_SKY2=m