debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

topconfig: disable PATA_SIS 

having 2 drivers enabled for the same pci ids is a bad idea.
as we don't switch over to pata yet, keep the old one enabled.

Lenny users will bug report *again* about changing root dev.
fun ;)
But it seems the nicer upgrade plan from Etch.

svn path=/dists/trunk/linux-2.6/; revision=11104
This commit is contained in:
Maximilian Attems 2008-04-19 15:46:20 +00:00
parent 6abb901a4d
commit 006b56d1bb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -39,6 +39,7 @@ linux-2.6 (2.6.25-1~experimental.1) UNRELEASED; urgency=low
* input: Add 4 additional exports for modular speakup and braille support.
* firewire: Add firewire-git.patch for latest firewire tree features.
* 686: Set USB_PERSIST for eee pc suspend support. (closes: #468213)
* topconfig disable PATA_SIS as sis5513 enabled. (closes: #475525)
[ Martin Michlmayr ]
* [arm/armel] Add a kernel for Orion based devices, such as the QNAP

2
debian/config/config vendored
View File

@ -128,7 +128,7 @@ CONFIG_PATA_MARVELL=m
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
CONFIG_PATA_SIS=m
# CONFIG_PATA_SIS is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
# CONFIG_PATA_WINBOND_VLB is not set