r3497 - in trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc: apus powerpc

Sven Luther luther@costa.debian.org
Fri, 15 Jul 2005 10:10:26 +0000 

Author: luther
Date: 2005-07-15 10:10:25 +0000 (Fri, 15 Jul 2005)
New Revision: 3497

Modified:
   trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/apus/config.apus
   trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.powerpc
   trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.powerpc-smp
   trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.pseries
Log:
Upgraded the powerpc configs to play nice with the patches.


Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/apus/config.apus
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/apus/config.apus	2005-07-15 09:49:38 UTC (rev 3496)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/apus/config.apus	2005-07-15 10:10:25 UTC (rev 3497)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12
-# Tue Jul 12 15:31:16 2005
+# Fri Jul 15 10:02:42 2005
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -78,6 +78,7 @@
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 # CONFIG_TAU_AVERAGE is not set
+# CONFIG_TAU_CALIBRATED is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
@@ -334,6 +335,7 @@
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -374,6 +376,7 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
+# CONFIG_MEGARAID_LEGACY is not set
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -410,7 +413,6 @@
 CONFIG_SCSI_QLOGIC_FC=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
@@ -1957,7 +1959,6 @@
 #
 # USB Miscellaneous drivers
 #
-# CONFIG_USB_EMI26 is not set
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
@@ -2103,6 +2104,9 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
+CONFIG_ASFS_FS=m
+CONFIG_ASFS_DEFAULT_CODEPAGE=""
+CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.powerpc
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.powerpc	2005-07-15 09:49:38 UTC (rev 3496)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.powerpc	2005-07-15 10:10:25 UTC (rev 3497)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12
-# Tue Jul 12 15:31:16 2005
+# Fri Jul 15 10:02:42 2005
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -78,6 +78,7 @@
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 # CONFIG_TAU_AVERAGE is not set
+# CONFIG_TAU_CALIBRATED is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
@@ -334,6 +335,7 @@
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -374,6 +376,7 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
+# CONFIG_MEGARAID_LEGACY is not set
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -410,7 +413,6 @@
 CONFIG_SCSI_QLOGIC_FC=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
@@ -1957,7 +1959,6 @@
 #
 # USB Miscellaneous drivers
 #
-# CONFIG_USB_EMI26 is not set
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
@@ -2103,6 +2104,9 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
+CONFIG_ASFS_FS=m
+CONFIG_ASFS_DEFAULT_CODEPAGE=""
+CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.powerpc-smp
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.powerpc-smp	2005-07-15 09:49:38 UTC (rev 3496)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.powerpc-smp	2005-07-15 10:10:25 UTC (rev 3497)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12
-# Thu Jul 14 19:13:22 2005
+# Fri Jul 15 10:07:06 2005
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -80,6 +80,7 @@
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 # CONFIG_TAU_AVERAGE is not set
+# CONFIG_TAU_CALIBRATED is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
@@ -338,6 +339,7 @@
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -378,6 +380,7 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
+# CONFIG_MEGARAID_LEGACY is not set
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -414,7 +417,6 @@
 CONFIG_SCSI_QLOGIC_FC=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
@@ -1956,7 +1958,6 @@
 #
 # USB Miscellaneous drivers
 #
-# CONFIG_USB_EMI26 is not set
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
@@ -2102,6 +2103,9 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
+CONFIG_ASFS_FS=m
+CONFIG_ASFS_DEFAULT_CODEPAGE=""
+CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.pseries
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.pseries	2005-07-15 09:49:38 UTC (rev 3496)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/arch/powerpc/powerpc/config.pseries	2005-07-15 10:10:25 UTC (rev 3497)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12
-# Tue Jul 12 15:31:16 2005
+# Fri Jul 15 10:02:42 2005
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -78,6 +78,7 @@
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 # CONFIG_TAU_AVERAGE is not set
+# CONFIG_TAU_CALIBRATED is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
@@ -334,6 +335,7 @@
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -374,6 +376,7 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
+# CONFIG_MEGARAID_LEGACY is not set
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -410,7 +413,6 @@
 CONFIG_SCSI_QLOGIC_FC=m
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=m
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
@@ -1957,7 +1959,6 @@
 #
 # USB Miscellaneous drivers
 #
-# CONFIG_USB_EMI26 is not set
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
@@ -2103,6 +2104,9 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
+CONFIG_ASFS_FS=m
+CONFIG_ASFS_DEFAULT_CODEPAGE=""
+CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m