[kernel] r13610 - in dists/trunk/linux-2.6/debian: . config/mips config/mipsel

[Martin Michlmayr]

Author: tbm
Date: Mon May 11 21:33:45 2009
New Revision: 13610

Log:
There is a platform PATA driver for SWARM IDE these days, so disable
IDE and build in ATA, SCSI and BLK_DEV_SD.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 11 19:20:17 2009	(r13609)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 11 21:33:45 2009	(r13610)
@@ -36,6 +36,9 @@
     BLK_DEV_IO_TRACE, CONTEXT_SWITCH_TRACER, ARM_UNWIND and
     SECURITY_SELINUX because of size constraints.
   * [armel/kirkwood] Add CPU idle driver (Rabeeh Khoury)
+  * [mips/sb1-bcm91250a, mipsel/sb1-bcm91250a] There is a platform PATA
+    driver for SWARM IDE these days, so disable IDE and build in ATA,
+    SCSI and BLK_DEV_SD.
 
  -- maximilian attems <maks at debian.org>  Mon, 30 Mar 2009 14:40:26 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Mon May 11 19:20:17 2009	(r13609)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Mon May 11 21:33:45 2009	(r13610)
@@ -126,7 +126,7 @@
 ##
 ## file: drivers/ata/Kconfig
 ##
-CONFIG_ATA=m
+CONFIG_ATA=y
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SIL24=m
 CONFIG_SATA_SVW=m
@@ -287,37 +287,7 @@
 ##
 ## file: drivers/ide/Kconfig
 ##
-CONFIG_IDE=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CY82C693=m
-# CONFIG_BLK_DEV_CS5520 is not set
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT821X=m
-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_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
+# CONFIG_IDE is not set
 
 ##
 ## file: drivers/infiniband/Kconfig
@@ -600,8 +570,8 @@
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_BLK_DEV_SD=m
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Mon May 11 19:20:17 2009	(r13609)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Mon May 11 21:33:45 2009	(r13610)
@@ -126,7 +126,7 @@
 ##
 ## file: drivers/ata/Kconfig
 ##
-CONFIG_ATA=m
+CONFIG_ATA=y
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SIL24=m
 CONFIG_SATA_SVW=m
@@ -287,37 +287,7 @@
 ##
 ## file: drivers/ide/Kconfig
 ##
-CONFIG_IDE=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CY82C693=m
-# CONFIG_BLK_DEV_CS5520 is not set
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT821X=m
-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_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-# CONFIG_IDE_ARM is not set
+# CONFIG_IDE is not set
 
 ##
 ## file: drivers/infiniband/Kconfig
@@ -600,8 +570,8 @@
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_BLK_DEV_SD=m
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m