On Mon, Aug 25, 2008 at 10:50:57PM -0300, Anibal Fenoglio wrote: > This module has been disable due to a problem between the pata_sis and > sis5513 modules with same PCI ID, but this problem it does not affect > at sata_sis module. Yeah. The attached patch should fix (more workaround) both problems. Bastian -- Superior ability breeds superior ambition. -- Spock, "Space Seed", stardate 3141.9
Index: debian/changelog
===================================================================
--- debian/changelog (revision 12161)
+++ debian/changelog (working copy)
@@ -6,6 +6,10 @@
[ Stephen R. Marenka ]
* [m68k] Set CONFIG_LBD=n for atari, since it conflicts with nfblock.
+ [ Bastian Blank ]
+ * Reenable SiS SATA support. (closes: #496603)
+ * [amd64/i386] Disable new-style SiS PATA support.
+
-- Martin Michlmayr <tbm@cyrius.com> Fri, 29 Aug 2008 16:02:27 +0300
linux-2.6 (2.6.26-4) unstable; urgency=low
Index: debian/patches/debian/drivers-ata-pata_sis-postpone-pata.patch
===================================================================
--- debian/patches/debian/drivers-ata-pata_sis-postpone-pata.patch (revision 0)
+++ debian/patches/debian/drivers-ata-pata_sis-postpone-pata.patch (revision 0)
@@ -0,0 +1,69 @@
+diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
+index ae84949..f17c19b 100644
+--- a/drivers/ata/Kconfig
++++ b/drivers/ata/Kconfig
+@@ -172,7 +172,7 @@ config SATA_SIL
+ config SATA_SIS
+ tristate "SiS 964/965/966/180 SATA support"
+ depends on PCI
+- select PATA_SIS
++ select PATA_SIS_STUB
+ help
+ This option enables support for SiS Serial ATA on
+ SiS 964/965/966/180 and Parallel ATA on SiS 180.
+@@ -618,9 +618,13 @@ config PATA_SIL680
+
+ If unsure, say N.
+
++config PATA_SIS_STUB
++ tristate
++
+ config PATA_SIS
+ tristate "SiS PATA support (Experimental)"
+ depends on PCI && EXPERIMENTAL
++ select PATA_SIS_STUB
+ help
+ This option enables support for SiS PATA controllers
+
+diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
+index 674965f..c4bce57 100644
+--- a/drivers/ata/Makefile
++++ b/drivers/ata/Makefile
+@@ -63,7 +63,7 @@ obj-$(CONFIG_PATA_SIL680) += pata_sil680.o
+ obj-$(CONFIG_PATA_VIA) += pata_via.o
+ obj-$(CONFIG_PATA_WINBOND) += pata_sl82c105.o
+ obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o
+-obj-$(CONFIG_PATA_SIS) += pata_sis.o
++obj-$(CONFIG_PATA_SIS_STUB) += pata_sis.o
+ obj-$(CONFIG_PATA_TRIFLEX) += pata_triflex.o
+ obj-$(CONFIG_PATA_IXP4XX_CF) += pata_ixp4xx_cf.o
+ obj-$(CONFIG_PATA_SCC) += pata_scc.o
+diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
+index 26345d7..2c3e3ba 100644
+--- a/drivers/ata/pata_sis.c
++++ b/drivers/ata/pata_sis.c
+@@ -826,13 +826,16 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
+ }
+
+ static const struct pci_device_id sis_pci_tbl[] = {
++#ifdef CONFIG_PATA_SIS
+ { PCI_VDEVICE(SI, 0x5513), }, /* SiS 5513 */
+ { PCI_VDEVICE(SI, 0x5518), }, /* SiS 5518 */
+ { PCI_VDEVICE(SI, 0x1180), }, /* SiS 1180 */
++#endif
+
+ { }
+ };
+
++#ifdef CONFIG_PATA_SIS
+ static struct pci_driver sis_pci_driver = {
+ .name = DRV_NAME,
+ .id_table = sis_pci_tbl,
+@@ -856,6 +859,7 @@ static void __exit sis_exit(void)
+
+ module_init(sis_init);
+ module_exit(sis_exit);
++#endif
+
+ MODULE_AUTHOR("Alan Cox");
+ MODULE_DESCRIPTION("SCSI low-level driver for SiS ATA");
Index: debian/patches/series/5
===================================================================
--- debian/patches/series/5 (revision 12161)
+++ debian/patches/series/5 (working copy)
@@ -1 +1,2 @@
+ bugfix/arm/kurobox_powerdown.patch
++ debian/drivers-ata-pata_sis-postpone-pata.patch
Index: debian/config/i386/config
===================================================================
--- debian/config/i386/config (revision 12161)
+++ debian/config/i386/config (working copy)
@@ -197,6 +197,7 @@
##
# CONFIG_PATA_CS5535 is not set
# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_SIS is not set
##
## file: drivers/atm/Kconfig
Index: debian/config/config
===================================================================
--- debian/config/config (revision 12161)
+++ debian/config/config (working copy)
@@ -93,7 +93,7 @@
CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
-# CONFIG_SATA_SIS is not set
+CONFIG_SATA_SIS=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
Index: debian/config/amd64/config
===================================================================
--- debian/config/amd64/config (revision 12161)
+++ debian/config/amd64/config (working copy)
@@ -127,6 +127,11 @@
CONFIG_ACPI_SBS=m
##
+## file: drivers/ata/Kconfig
+##
+# CONFIG_PATA_SIS is not set
+
+##
## file: drivers/atm/Kconfig
##
CONFIG_ATM_DRIVERS=y
Attachment:
signature.asc
Description: Digital signature