SOURCES (LINUX_2_6): kernel-ppc.config, kernel-ppc-smp.config - ID...

[baggins]

Author: baggins                      Date: Fri Apr 28 17:40:41 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- IDE must be compiled in, reason:
config BLK_DEV_IDE_PMAC
        bool "Builtin PowerMac IDE support"
        depends on PPC_PMAC && IDE=y

---- Files affected:
SOURCES:
   kernel-ppc.config (1.3.2.3.2.2.2.186 -> 1.3.2.3.2.2.2.187) , kernel-ppc-smp.config (1.6.4.1.2.186 -> 1.6.4.1.2.187) 

---- Diffs:

================================================================
Index: SOURCES/kernel-ppc.config
diff -u SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.186 SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.187
--- SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.186	Fri Apr 28 19:29:34 2006
+++ SOURCES/kernel-ppc.config	Fri Apr 28 19:40:35 2006
@@ -821,14 +821,14 @@
 #
 # ATA/ATAPI/MFM/RLL support
 #
-CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDECD=m
@@ -876,6 +876,10 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
+CONFIG_BLK_DEV_IDE_PMAC=y
+CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
+CONFIG_BLK_DEV_IDEDMA_PMAC=y
+CONFIG_BLK_DEV_IDE_PMAC_BLINK=y
 # CONFIG_IDE_ARM is not set
 CONFIG_IDE_CHIPSETS=y
 
@@ -974,6 +978,7 @@
 CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI_SATA_INTEL_COMBINED=y
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_DMX3191D=m

================================================================
Index: SOURCES/kernel-ppc-smp.config
diff -u SOURCES/kernel-ppc-smp.config:1.6.4.1.2.186 SOURCES/kernel-ppc-smp.config:1.6.4.1.2.187
--- SOURCES/kernel-ppc-smp.config:1.6.4.1.2.186	Fri Apr 28 19:29:34 2006
+++ SOURCES/kernel-ppc-smp.config	Fri Apr 28 19:40:36 2006
@@ -814,14 +814,14 @@
 #
 # ATA/ATAPI/MFM/RLL support
 #
-CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDECD=m
@@ -869,6 +869,10 @@
 CONFIG_BLK_DEV_SLC90E66=m
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
+CONFIG_BLK_DEV_IDE_PMAC=y
+CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
+CONFIG_BLK_DEV_IDEDMA_PMAC=y
+CONFIG_BLK_DEV_IDE_PMAC_BLINK=y
 # CONFIG_IDE_ARM is not set
 CONFIG_IDE_CHIPSETS=y
 
@@ -967,6 +971,7 @@
 CONFIG_SCSI_SATA_ULI=m
 CONFIG_SCSI_SATA_VIA=m
 CONFIG_SCSI_SATA_VITESSE=m
+CONFIG_SCSI_SATA_INTEL_COMBINED=y
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_DMX3191D=m
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-ppc.config?r1=1.3.2.3.2.2.2.186&r2=1.3.2.3.2.2.2.187&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-ppc-smp.config?r1=1.6.4.1.2.186&r2=1.6.4.1.2.187&f=u