From a0718a21e1602876cc632cd7bb42fd096d2c09fd Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 10 Jan 2006 22:59:56 +0000 Subject: [PATCH] [arm] Update configs for 2.6.15. svn path=/dists/trunk/linux-2.6/; revision=5392 --- debian/arch/arm/config | 2 ++ debian/arch/arm/config.footbridge | 10 ++++++- debian/arch/arm/config.ixp4xx | 7 ++++- debian/arch/arm/config.rpc | 2 +- debian/arch/arm/config.s3c2410 | 46 +++++++++++++++++++++++++++++++ debian/changelog | 7 +++++ 6 files changed, 71 insertions(+), 3 deletions(-) diff --git a/debian/arch/arm/config b/debian/arch/arm/config index 2bc13c999..e78559b01 100644 --- a/debian/arch/arm/config +++ b/debian/arch/arm/config @@ -17,3 +17,5 @@ CONFIG_EQUALIZER=m CONFIG_NET_CLS_ROUTE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_IPW2100 is not set +CONFIG_JBD=y +# CONFIG_ARCH_REALVIEW is not set diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index dc1e50e9b..ac6caaa07 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1243,7 +1243,6 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -# CONFIG_JBD is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -1746,3 +1745,12 @@ CONFIG_BLK_DEV_SC1200=m CONFIG_BLK_DEV_PDC202XX_OLD=m # CONFIG_LANCE is not set # CONFIG_NET_CLS_ROUTE is not set +CONFIG_VIDEO_TVEEPROM=m +# CONFIG_USB_AUDIO is not set +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TUNER=m +# CONFIG_MEGARAID_MM is not set +CONFIG_VIDEO_BUF=m +CONFIG_SPLIT_PTLOCK_CPUS=4096 diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index dce23cc6d..764377975 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1177,7 +1177,6 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y # CONFIG_EXT3_FS_SECURITY is not set -CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=m @@ -1441,3 +1440,9 @@ CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m +# CONFIG_PM_DEBUG is not set +# CONFIG_MEGARAID_MM is not set +CONFIG_PM_LEGACY=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_MTD_ONENAND_GENERIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 6a1539850..8b2e65acb 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -803,7 +803,6 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set -CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=m @@ -1058,3 +1057,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m +CONFIG_SPLIT_PTLOCK_CPUS=4096 diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index dfce98285..5ed285940 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -1271,3 +1271,49 @@ CONFIG_USB_SERIAL=m CONFIG_PPP=m CONFIG_CRC_CCITT=m # CONFIG_NET_CLS_ROUTE is not set +# CONFIG_LANCE is not set +# CONFIG_PM_DEBUG is not set +CONFIG_ISA=y +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_NET_PCI is not set +# CONFIG_MOUSE_LOGIBM is not set +# CONFIG_DEPCA is not set +# CONFIG_MOUSE_PC110PAD is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_I2C_ELEKTOR is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_TR is not set +CONFIG_PM_LEGACY=y +# CONFIG_AT1700 is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_WDT is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_HP100 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_S3C2410_BOOT_ERROR_RESET is not set +# CONFIG_ARCNET is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_NET_ISA is not set +# CONFIG_MTD_ONENAND_GENERIC is not set +# CONFIG_MDA_CONSOLE is not set +# CONFIG_ESPSERIAL is not set +# CONFIG_MOUSE_INPORT is not set +# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_PNP is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_BLK_DEV_XD is not set diff --git a/debian/changelog b/debian/changelog index 66ccddf4c..4de17956f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-2.6 (2.6.15-3) UNRELEASED; urgency=low + + [ Martin Michlmayr ] + * [arm] Update configs for 2.6.15. + + -- Martin Michlmayr Tue, 10 Jan 2006 22:59:19 +0000 + linux-2.6 (2.6.15-2) unstable; urgency=low [ maximilian attems ]