[kernel] r18704 - in dists/sid/linux-2.6/debian: . config config/alpha config/armel config/hppa config/ia64 config/kernelarch-x86 config/powerpc config/sparc
Ben Hutchings
benh at alioth.debian.org
Mon Feb 20 00:49:47 UTC 2012
Author: benh
Date: Mon Feb 20 00:49:46 2012
New Revision: 18704
Log:
Use libata-based drivers for most of the remaining PATA controllers
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/config/alpha/config
dists/sid/linux-2.6/debian/config/armel/config.iop32x
dists/sid/linux-2.6/debian/config/config
dists/sid/linux-2.6/debian/config/hppa/config
dists/sid/linux-2.6/debian/config/ia64/config
dists/sid/linux-2.6/debian/config/kernelarch-x86/config
dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32
dists/sid/linux-2.6/debian/config/powerpc/config
dists/sid/linux-2.6/debian/config/sparc/config
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/changelog Mon Feb 20 00:49:46 2012 (r18704)
@@ -2,6 +2,18 @@
[ Ben Hutchings ]
* Add Turkish debconf template translations (Mert Dirik) (Closes: #660117)
+ * [amd64] Disable BLK_DEV_IDEPNP, BLK_DEV_OPTI621, IDE_GENERIC
+ * Use libata-based drivers for most of the remaining PATA controllers:
+ - pata_legacy replaces ide-generic
+ - pata_isapnp replaces ide-pnp
+ - pata_opti replaces opti621
+ - pata_hpt366 and pata_hpt37x replace hpt366
+ - pata_ninja32 replaces delkin_cb
+ - pata_cs5535 replaces cs5535
+ - pata_winbond replaces sl82c105
+ - [alpha] pata_cypress replaces cy82c693
+ - [hppa] pata_ns87415 replaces ns87415
+ - [sparc] Various replacements, as for x86 in 2.6.32-10
-- Ben Hutchings <ben at decadent.org.uk> Fri, 17 Feb 2012 03:29:39 +0000
Modified: dists/sid/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/alpha/config Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/alpha/config Mon Feb 20 00:49:46 2012 (r18704)
@@ -56,7 +56,10 @@
CONFIG_PATA_AMD=m
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
+CONFIG_PATA_CYPRESS=m
CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_PDC2027X=m
@@ -67,6 +70,9 @@
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
CONFIG_PATA_MPIIX=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_ISAPNP=y
+CONFIG_PATA_LEGACY=m
##
## file: drivers/atm/Kconfig
@@ -292,20 +298,20 @@
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_IDEPNP=y
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
-CONFIG_BLK_DEV_CY82C693=m
+# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
-CONFIG_BLK_DEV_HPT366=m
+# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_NS87415 is not set
Modified: dists/sid/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.iop32x Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/armel/config.iop32x Mon Feb 20 00:49:46 2012 (r18704)
@@ -75,6 +75,8 @@
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_OLDPIIX=m
@@ -85,8 +87,11 @@
CONFIG_PATA_SIL680=m
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_LEGACY=m
##
## file: drivers/block/Kconfig
@@ -222,19 +227,18 @@
CONFIG_IDE_GD=m
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_IDE_GENERIC=m
+# CONFIG_IDE_GENERIC is not set
CONFIG_BLK_DEV_OFFBOARD=y
# CONFIG_BLK_DEV_GENERIC is not set
-CONFIG_BLK_DEV_OPTI621=m
+# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
-CONFIG_BLK_DEV_CY82C693=m
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
-CONFIG_BLK_DEV_HPT366=m
+# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_IT821X is not set
@@ -243,7 +247,7 @@
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
-CONFIG_BLK_DEV_SL82C105=m
+# CONFIG_BLK_DEV_SL82C105=m
# CONFIG_BLK_DEV_SLC90E66 is not set
CONFIG_BLK_DEV_TRM290=m
# CONFIG_BLK_DEV_VIA82CXXX is not set
Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/config Mon Feb 20 00:49:46 2012 (r18704)
@@ -133,7 +133,7 @@
CONFIG_PATA_JMICRON=m
CONFIG_PATA_MARVELL=m
# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
+CONFIG_PATA_NINJA32=m
# CONFIG_PATA_NS87415 is not set
# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTIDMA is not set
@@ -545,7 +545,6 @@
CONFIG_IDE_GD=m
CONFIG_IDE_GD_ATA=y
CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_DELKIN=m
# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_PROC_FS=y
# CONFIG_BLK_DEV_PLATFORM is not set
Modified: dists/sid/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/hppa/config Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/hppa/config Mon Feb 20 00:49:46 2012 (r18704)
@@ -23,6 +23,12 @@
# CONFIG_DEBUG_RODATA is not set
##
+## file: drivers/ata/Kconfig
+##
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_LEGACY=m
+
+##
## file: drivers/block/Kconfig
##
# CONFIG_BLK_DEV_FD is not set
@@ -96,7 +102,7 @@
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_IDE_GENERIC=m
+# CONFIG_IDE_GENERIC is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
@@ -111,7 +117,7 @@
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
-CONFIG_BLK_DEV_NS87415=m
+# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
Modified: dists/sid/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/ia64/config Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/ia64/config Mon Feb 20 00:49:46 2012 (r18704)
@@ -58,6 +58,8 @@
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_OLDPIIX=m
@@ -70,6 +72,8 @@
CONFIG_PATA_VIA=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_LEGACY=m
##
## file: drivers/block/Kconfig
@@ -231,19 +235,18 @@
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_IDE_GENERIC=m
+# CONFIG_IDE_GENERIC is not set
# CONFIG_BLK_DEV_IDEPNP is not set
# CONFIG_BLK_DEV_GENERIC is not set
-CONFIG_BLK_DEV_OPTI621=m
+# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
-CONFIG_BLK_DEV_CY82C693=m
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
-CONFIG_BLK_DEV_HPT366=m
+# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_NS87415 is not set
Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config Mon Feb 20 00:49:46 2012 (r18704)
@@ -152,6 +152,8 @@
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_OLDPIIX=m
@@ -525,13 +527,13 @@
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
# CONFIG_BLK_DEV_IDEACPI is not set
-CONFIG_IDE_GENERIC=m
+# CONFIG_IDE_GENERIC is not set
# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=y
+# CONFIG_BLK_DEV_IDEPNP is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
-CONFIG_BLK_DEV_OPTI621=m
+# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_RZ1000 is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -539,10 +541,9 @@
# CONFIG_BLK_DEV_ATIIXP is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
-CONFIG_BLK_DEV_CY82C693=m
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
-CONFIG_BLK_DEV_HPT366=m
+# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_NS87415 is not set
Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32 Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32 Mon Feb 20 00:49:46 2012 (r18704)
@@ -62,8 +62,11 @@
##
## file: drivers/ata/Kconfig
##
-# CONFIG_PATA_CS5535 is not set
+CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
+CONFIG_PATA_ISAPNP=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_LEGACY=m
##
## file: drivers/atm/Kconfig
@@ -155,7 +158,6 @@
##
## file: drivers/ide/Kconfig
##
-CONFIG_BLK_DEV_CS5535=m
# CONFIG_BLK_DEV_CS5536 is not set
# CONFIG_BLK_DEV_4DRIVES is not set
# CONFIG_BLK_DEV_ALI14XX is not set
Modified: dists/sid/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/powerpc/config Mon Feb 20 00:49:46 2012 (r18704)
@@ -79,6 +79,8 @@
## file: drivers/ata/Kconfig
##
CONFIG_ATA=y
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
CONFIG_PATA_MACIO=y
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87415=m
@@ -87,6 +89,7 @@
CONFIG_PATA_SC1200=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_PCMCIA=m
@@ -292,7 +295,7 @@
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
-CONFIG_BLK_DEV_HPT366=m
+# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_NS87415 is not set
@@ -300,7 +303,7 @@
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
-CONFIG_BLK_DEV_SL82C105=m
+# CONFIG_BLK_DEV_SL82C105 is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
CONFIG_BLK_DEV_TRM290=m
# CONFIG_BLK_DEV_VIA82CXXX is not set
Modified: dists/sid/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/sparc/config Sun Feb 19 22:01:27 2012 (r18703)
+++ dists/sid/linux-2.6/debian/config/sparc/config Mon Feb 20 00:49:46 2012 (r18704)
@@ -18,6 +18,22 @@
CONFIG_SUN_OPENPROMFS=m
##
+## file: drivers/ata/Kconfig
+##
+CONFIG_PATA_LEGACY=m
+CONFIG_PATA_ALI=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_PDC202XX_OLD=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_NS87410=m
+
+##
## file: drivers/block/Kconfig
##
CONFIG_BLK_DEV_FD=y
@@ -144,29 +160,28 @@
CONFIG_IDE_GD=y
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_IDE_GENERIC=m
+# CONFIG_IDE_GENERIC is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
+# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_AEC62XX is not set
-CONFIG_BLK_DEV_ALI15X3=m
+# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
-CONFIG_BLK_DEV_CY82C693=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
+# CONFIG_BLK_DEV_VIA82CXXX is not set
##
## file: drivers/input/Kconfig
More information about the Kernel-svn-changes
mailing list