[kernel] r9808 - dists/trunk/linux-2.6/debian/config

Maximilian Attems maks at alioth.debian.org
Tue Nov 27 15:22:38 UTC 2007


Author: maks
Date: Tue Nov 27 15:22:38 2007
New Revision: 9808

Log:
topconfig beatify reoder SATA options


Modified:
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Nov 27 15:22:38 2007
@@ -644,6 +644,25 @@
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_SRP=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INIC162X=m
 # CONFIG_PATA_ACPI is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
@@ -1829,26 +1848,6 @@
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_IDE_PROC_FS=y
 
-#
-# PCMCIA SCSI adapter support
-#
-CONFIG_ATA=m
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_SVW=m
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_INIC162X=m
 CONFIG_PCNET32_NAPI=y
 CONFIG_EEPROM_93CX6=m
 CONFIG_SGI_IOC4=m
@@ -1888,7 +1887,6 @@
 CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
 CONFIG_MOXA_SMARTIO_NEW=m
-# CONFIG_ATA_NONSTANDARD is not set
 CONFIG_AC97_BUS=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
@@ -1896,7 +1894,6 @@
 # CONFIG_FORCEDETH_NAPI is not set
 CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_BATTERY_DS2760=m
-CONFIG_ATA_ACPI=y
 CONFIG_TOUCHSCREEN_USB_3M=y
 # CONFIG_SND_SOC is not set
 CONFIG_ELF_CORE=y



More information about the Kernel-svn-changes mailing list