[kernel] r12162 - in dists/sid/linux-2.6/debian: . config config/amd64 config/i386 patches/debian patches/series

[Bastian Blank]

Author: waldi
Date: Tue Sep  2 12:42:36 2008
New Revision: 12162

Log:
- Reenable SiS SATA support.
- [amd64,i386] Disable new-style SiS PATA support.

* debian/changelog: Update.
* debian/patches/debian/drivers-ata-pata_sis-postpone-pata.patch: Add.
* debian/patches/series/5: Add new patch.
* debian/config/config: Enable SATA_SIS.
* debian/config/amd64/config, debian/config/i386/config: Disable PATA_SIS.


Added:
   dists/sid/linux-2.6/debian/patches/debian/drivers-ata-pata_sis-postpone-pata.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/amd64/config
   dists/sid/linux-2.6/debian/config/config
   dists/sid/linux-2.6/debian/config/i386/config
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Sep  2 12:42:36 2008
@@ -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 at cyrius.com>  Fri, 29 Aug 2008 16:02:27 +0300
 
 linux-2.6 (2.6.26-4) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/amd64/config	(original)
+++ dists/sid/linux-2.6/debian/config/amd64/config	Tue Sep  2 12:42:36 2008
@@ -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

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	(original)
+++ dists/sid/linux-2.6/debian/config/config	Tue Sep  2 12:42:36 2008
@@ -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

Modified: dists/sid/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/config	(original)
+++ dists/sid/linux-2.6/debian/config/i386/config	Tue Sep  2 12:42:36 2008
@@ -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

Added: dists/sid/linux-2.6/debian/patches/debian/drivers-ata-pata_sis-postpone-pata.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/debian/drivers-ata-pata_sis-postpone-pata.patch	Tue Sep  2 12:42:36 2008
@@ -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");

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	(original)
+++ dists/sid/linux-2.6/debian/patches/series/5	Tue Sep  2 12:42:36 2008
@@ -1 +1,2 @@
 + bugfix/arm/kurobox_powerdown.patch
++ debian/drivers-ata-pata_sis-postpone-pata.patch