From 9e6e325968c921deb20bf79965bc2d1addf96fe6 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Sun, 19 Nov 2006 15:52:11 +0000 Subject: [PATCH] Unset SATA for s3c2410 and footbridge svn path=/dists/trunk/linux-2.6/; revision=7841 --- debian/arch/arm/config.footbridge | 19 +++++-------------- debian/arch/arm/config.ixp4xx | 6 +++++- debian/arch/arm/config.s3c2410 | 6 +++++- debian/arch/arm/config.versatile | 6 +++++- debian/changelog | 2 ++ 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index d41181971..c70d76a77 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -515,20 +515,6 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_SATA=m -CONFIG_SCSI_SATA_AHCI=m -CONFIG_SCSI_SATA_SVW=m -CONFIG_SCSI_ATA_PIIX=m -CONFIG_SCSI_SATA_MV=m -CONFIG_SCSI_SATA_NV=m -CONFIG_SCSI_SATA_PROMISE=m -CONFIG_SCSI_SATA_QSTOR=m -CONFIG_SCSI_SATA_SX4=m -CONFIG_SCSI_SATA_SIL=m -CONFIG_SCSI_SATA_SIS=m -CONFIG_SCSI_SATA_ULI=m -CONFIG_SCSI_SATA_VIA=m -CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_DTC3280 is not set @@ -559,6 +545,11 @@ CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +CONFIG_ATA is not set + # # Multi-device support (RAID and LVM) # diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index e61dc063d..1ce421d4a 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -706,7 +706,6 @@ CONFIG_SCSI_SAS_ATTRS=m # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_IPS is not set @@ -724,6 +723,11 @@ CONFIG_SCSI_QLA_FC=m # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +CONFIG_ATA is not set + # # Multi-device support (RAID and LVM) # diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index 0cbe090f2..bc4dd558b 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -463,11 +463,15 @@ CONFIG_SCSI_SAS_ATTRS=m # # SCSI low-level drivers # -CONFIG_SCSI_SATA=m # CONFIG_SCSI_PPA is not set # CONFIG_SCSI_IMM is not set # CONFIG_SCSI_DEBUG is not set +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +CONFIG_ATA is not set + # # Multi-device support (RAID and LVM) # diff --git a/debian/arch/arm/config.versatile b/debian/arch/arm/config.versatile index 3d738dcf7..dcf84c472 100644 --- a/debian/arch/arm/config.versatile +++ b/debian/arch/arm/config.versatile @@ -669,7 +669,6 @@ CONFIG_SCSI_SPI_ATTRS=y # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_SATA is not set CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set @@ -690,6 +689,11 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +CONFIG_ATA is not set + # # Multi-device support (RAID and LVM) # diff --git a/debian/changelog b/debian/changelog index 9b9596a23..626105c21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ linux-2.6 (2.6.19~rc6-1~experimental.1) UNRELEASED; urgency=low * arm: Drop RiscPC (rpc) support. * arm: Update configs for 2.6.19-rc6. * arm: source drivers/ata/Kconfig so SATA can be enabled on ARM. + * arm/footbridge: Unset SATA. + * arm/s3c2410: Likewise. -- Bastian Blank Sun, 19 Nov 2006 12:05:33 +0100