[kernel] r7140 - in dists/sid/linux-2.6/debian: arch/arm

[Martin Michlmayr]

Author: tbm
Date: Fri Aug 11 21:00:54 2006
New Revision: 7140

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.iop32x
   dists/sid/linux-2.6/debian/changelog

Log:
arm/iop32x: Build IDE as modules.


Modified: dists/sid/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.iop32x	Fri Aug 11 21:00:54 2006
@@ -641,14 +641,14 @@
 #
 # ATA/ATAPI/MFM/RLL support
 #
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
@@ -659,7 +659,7 @@
 #
 # IDE chipset support/bugfixes
 #
-CONFIG_IDE_GENERIC=y
+CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_OFFBOARD=y
@@ -764,7 +764,6 @@
 CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_SATA_INTEL_COMBINED=y
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Aug 11 21:00:54 2006
@@ -2,6 +2,7 @@
 
   [ Martin Michlmayr ]
   * arm/iop32x: Enable CONFIG_BLK_DEV_OFFBOARD.
+  * arm/iop32x: Build IDE as modules.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Fri, 11 Aug 2006 22:49:46 +0200