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.

svn path=/dists/trunk/linux-2.6/; revision=11340
This commit is contained in:
Maximilian Attems 2008-05-08 22:13:25 +00:00
parent d819b4cf30
commit 8f894774d4
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View File

@ -16,6 +16,8 @@ linux-2.6 (2.6.26~rc1-1~experimental.1) UNRELEASED; urgency=low
* [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@debian.org> Sat, 26 Apr 2008 23:11:17 +0200

View File

@ -981,7 +981,7 @@ CONFIG_E1000E=m
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