Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4575ceb1 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

[PATCH] M68k: Update defconfigs for 2.6.11 



Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 15e88699

arch/m68k/configs/amiga_defconfig

+26 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.10-m68k

# Sun Dec 26 11:22:54 2004

# Linux kernel version: 2.6.11-m68k

# Wed Mar  2 15:28:00 2005

#

CONFIG_M68K=y

CONFIG_MMU=y

CONFIG_UID16=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_CALIBRATE_DELAY=y



#

# Code maturity level options
@@ -27,7 +28,7 @@ CONFIG_BSD_PROCESS_ACCT=y 
CONFIG_SYSCTL=y

CONFIG_AUDIT=y

CONFIG_LOG_BUF_SHIFT=16

# CONFIG_HOTPLUG is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

# CONFIG_EMBEDDED is not set
@@ -104,6 +105,7 @@ CONFIG_ZORRO_NAMES=y 
#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m

# CONFIG_DEBUG_DRIVER is not set



#
@@ -133,6 +135,7 @@ CONFIG_AMIGA_FLOPPY=y 
CONFIG_AMIGA_Z2RAM=y

# CONFIG_BLK_DEV_XD is not set

# CONFIG_PARIDE is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m
@@ -152,6 +155,7 @@ CONFIG_IOSCHED_NOOP=y 
CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_ATA_OVER_ETH=m



#

# ATA/ATAPI/MFM/RLL support
@@ -212,6 +216,7 @@ CONFIG_SCSI_CONSTANTS=y 
#

# CONFIG_SCSI_SPI_ATTRS is not set

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set



#

# SCSI low-level drivers
@@ -394,8 +399,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_IP_NF_COMPAT_IPCHAINS=m

CONFIG_IP_NF_COMPAT_IPFWADM=m



#

# IPv6: Netfilter Configuration
@@ -707,6 +710,7 @@ CONFIG_LOGO=y 
CONFIG_LOGO_LINUX_MONO=y

CONFIG_LOGO_LINUX_VGA16=y

CONFIG_LOGO_LINUX_CLUT224=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound
@@ -735,6 +739,11 @@ CONFIG_DMASOUND=m 
#

# CONFIG_MMC is not set



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# Character devices

#
@@ -758,10 +767,16 @@ CONFIG_REISERFS_FS=m 
# CONFIG_REISERFS_FS_XATTR is not set

CONFIG_JFS_FS=m

# CONFIG_JFS_POSIX_ACL is not set

# CONFIG_JFS_SECURITY is not set

# CONFIG_JFS_DEBUG is not set

# CONFIG_JFS_STATISTICS is not set

CONFIG_FS_POSIX_ACL=y



#

# XFS support

#

CONFIG_XFS_FS=m

CONFIG_XFS_EXPORT=y

# CONFIG_XFS_RT is not set

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_SECURITY is not set
@@ -921,8 +936,9 @@ CONFIG_MAGIC_SYSRQ=y 
# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set



#

# Security options
@@ -958,6 +974,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m 
CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_TEST=m



#

# Hardware crypto devices

#



#

# Library routines

#

arch/m68k/configs/apollo_defconfig

+26 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.10-m68k

# Sun Dec 26 11:22:58 2004

# Linux kernel version: 2.6.11-m68k

# Wed Mar  2 15:28:01 2005

#

CONFIG_M68K=y

CONFIG_MMU=y

CONFIG_UID16=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_CALIBRATE_DELAY=y



#

# Code maturity level options
@@ -27,7 +28,7 @@ CONFIG_BSD_PROCESS_ACCT=y 
CONFIG_SYSCTL=y

CONFIG_AUDIT=y

CONFIG_LOG_BUF_SHIFT=16

# CONFIG_HOTPLUG is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

# CONFIG_EMBEDDED is not set
@@ -99,6 +100,7 @@ CONFIG_PROC_HARDWARE=y 
#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m

# CONFIG_DEBUG_DRIVER is not set



#
@@ -118,6 +120,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

# Block devices

#

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m
@@ -137,6 +140,7 @@ CONFIG_IOSCHED_NOOP=y 
CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_ATA_OVER_ETH=m



#

# ATA/ATAPI/MFM/RLL support
@@ -171,6 +175,7 @@ CONFIG_SCSI_CONSTANTS=y 
#

# CONFIG_SCSI_SPI_ATTRS is not set

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set



#

# SCSI low-level drivers
@@ -320,8 +325,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_IP_NF_COMPAT_IPCHAINS=m

CONFIG_IP_NF_COMPAT_IPFWADM=m



#

# IPv6: Netfilter Configuration
@@ -476,6 +479,7 @@ CONFIG_SOUND_GAMEPORT=y 
CONFIG_SERIO=m

CONFIG_SERIO_SERPORT=m

# CONFIG_SERIO_CT82C710 is not set

CONFIG_SERIO_LIBPS2=m

# CONFIG_SERIO_RAW is not set



#
@@ -594,6 +598,11 @@ CONFIG_DUMMY_CONSOLE=y 
#

# CONFIG_MMC is not set



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# Character devices

#
@@ -615,10 +624,16 @@ CONFIG_REISERFS_FS=m 
# CONFIG_REISERFS_FS_XATTR is not set

CONFIG_JFS_FS=m

# CONFIG_JFS_POSIX_ACL is not set

# CONFIG_JFS_SECURITY is not set

# CONFIG_JFS_DEBUG is not set

# CONFIG_JFS_STATISTICS is not set

CONFIG_FS_POSIX_ACL=y



#

# XFS support

#

CONFIG_XFS_FS=m

CONFIG_XFS_EXPORT=y

# CONFIG_XFS_RT is not set

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_SECURITY is not set
@@ -778,8 +793,9 @@ CONFIG_MAGIC_SYSRQ=y 
# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set



#

# Security options
@@ -815,6 +831,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m 
CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_TEST=m



#

# Hardware crypto devices

#



#

# Library routines

#

arch/m68k/configs/atari_defconfig

+27 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.10-m68k

# Sun Dec 26 11:23:11 2004

# Linux kernel version: 2.6.11-m68k

# Wed Mar  2 15:28:03 2005

#

CONFIG_M68K=y

CONFIG_MMU=y

CONFIG_UID16=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_CALIBRATE_DELAY=y



#

# Code maturity level options
@@ -27,7 +28,7 @@ CONFIG_BSD_PROCESS_ACCT=y 
CONFIG_SYSCTL=y

CONFIG_AUDIT=y

CONFIG_LOG_BUF_SHIFT=16

# CONFIG_HOTPLUG is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

# CONFIG_EMBEDDED is not set
@@ -100,6 +101,7 @@ CONFIG_PROC_HARDWARE=y 
#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m

# CONFIG_DEBUG_DRIVER is not set



#
@@ -125,6 +127,7 @@ CONFIG_PARPORT_1284=y 
#

CONFIG_ATARI_FLOPPY=y

# CONFIG_PARIDE is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m
@@ -144,6 +147,7 @@ CONFIG_IOSCHED_NOOP=y 
CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_ATA_OVER_ETH=m



#

# ATA/ATAPI/MFM/RLL support
@@ -201,6 +205,7 @@ CONFIG_SCSI_CONSTANTS=y 
#

# CONFIG_SCSI_SPI_ATTRS is not set

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set



#

# SCSI low-level drivers
@@ -349,8 +354,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_IP_NF_COMPAT_IPCHAINS=m

CONFIG_IP_NF_COMPAT_IPFWADM=m



#

# IPv6: Netfilter Configuration
@@ -507,6 +510,7 @@ CONFIG_SERIO=y 
CONFIG_SERIO_SERPORT=y

# CONFIG_SERIO_CT82C710 is not set

# CONFIG_SERIO_PARKBD is not set

CONFIG_SERIO_LIBPS2=y

# CONFIG_SERIO_RAW is not set



#
@@ -619,6 +623,7 @@ CONFIG_FONT_8x16=y 
# Logo configuration

#

# CONFIG_LOGO is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound
@@ -647,6 +652,11 @@ CONFIG_DMASOUND=m 
#

# CONFIG_MMC is not set



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# Character devices

#
@@ -672,9 +682,15 @@ CONFIG_REISERFS_PROC_INFO=y 
# CONFIG_REISERFS_FS_XATTR is not set

CONFIG_JFS_FS=m

# CONFIG_JFS_POSIX_ACL is not set

# CONFIG_JFS_SECURITY is not set

# CONFIG_JFS_DEBUG is not set

# CONFIG_JFS_STATISTICS is not set



#

# XFS support

#

CONFIG_XFS_FS=m

CONFIG_XFS_EXPORT=y

# CONFIG_XFS_RT is not set

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_SECURITY is not set
@@ -833,8 +849,9 @@ CONFIG_MAGIC_SYSRQ=y 
# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set



#

# Security options
@@ -870,6 +887,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m 
CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_TEST=m



#

# Hardware crypto devices

#



#

# Library routines

#

arch/m68k/configs/bvme6000_defconfig

+26 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.10-m68k

# Sun Dec 26 11:23:15 2004

# Linux kernel version: 2.6.11-m68k

# Wed Mar  2 15:28:04 2005

#

CONFIG_M68K=y

CONFIG_MMU=y

CONFIG_UID16=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_CALIBRATE_DELAY=y



#

# Code maturity level options
@@ -27,7 +28,7 @@ CONFIG_BSD_PROCESS_ACCT=y 
CONFIG_SYSCTL=y

CONFIG_AUDIT=y

CONFIG_LOG_BUF_SHIFT=16

# CONFIG_HOTPLUG is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

# CONFIG_EMBEDDED is not set
@@ -99,6 +100,7 @@ CONFIG_PROC_HARDWARE=y 
#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m

# CONFIG_DEBUG_DRIVER is not set



#
@@ -118,6 +120,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

# Block devices

#

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m
@@ -137,6 +140,7 @@ CONFIG_IOSCHED_NOOP=y 
CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_ATA_OVER_ETH=m



#

# ATA/ATAPI/MFM/RLL support
@@ -171,6 +175,7 @@ CONFIG_SCSI_CONSTANTS=y 
#

# CONFIG_SCSI_SPI_ATTRS is not set

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set



#

# SCSI low-level drivers
@@ -320,8 +325,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_IP_NF_COMPAT_IPCHAINS=m

CONFIG_IP_NF_COMPAT_IPFWADM=m



#

# IPv6: Netfilter Configuration
@@ -475,6 +478,7 @@ CONFIG_SOUND_GAMEPORT=y 
CONFIG_SERIO=m

CONFIG_SERIO_SERPORT=m

# CONFIG_SERIO_CT82C710 is not set

CONFIG_SERIO_LIBPS2=m

# CONFIG_SERIO_RAW is not set



#
@@ -593,6 +597,11 @@ CONFIG_DUMMY_CONSOLE=y 
#

# CONFIG_MMC is not set



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# Character devices

#
@@ -614,10 +623,16 @@ CONFIG_REISERFS_FS=m 
# CONFIG_REISERFS_FS_XATTR is not set

CONFIG_JFS_FS=m

# CONFIG_JFS_POSIX_ACL is not set

# CONFIG_JFS_SECURITY is not set

# CONFIG_JFS_DEBUG is not set

# CONFIG_JFS_STATISTICS is not set

CONFIG_FS_POSIX_ACL=y



#

# XFS support

#

CONFIG_XFS_FS=m

CONFIG_XFS_EXPORT=y

# CONFIG_XFS_RT is not set

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_SECURITY is not set
@@ -777,8 +792,9 @@ CONFIG_MAGIC_SYSRQ=y 
# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set



#

# Security options
@@ -814,6 +830,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m 
CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_TEST=m



#

# Hardware crypto devices

#



#

# Library routines

#

arch/m68k/configs/hp300_defconfig

+26 −6
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.10-m68k

# Sun Dec 26 11:23:40 2004

# Linux kernel version: 2.6.11-m68k

# Wed Mar  2 15:28:06 2005

#

CONFIG_M68K=y

CONFIG_MMU=y

CONFIG_UID16=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_CALIBRATE_DELAY=y



#

# Code maturity level options
@@ -27,7 +28,7 @@ CONFIG_BSD_PROCESS_ACCT=y 
CONFIG_SYSCTL=y

CONFIG_AUDIT=y

CONFIG_LOG_BUF_SHIFT=16

# CONFIG_HOTPLUG is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

# CONFIG_EMBEDDED is not set
@@ -100,6 +101,7 @@ CONFIG_PROC_HARDWARE=y 
#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m

# CONFIG_DEBUG_DRIVER is not set



#
@@ -119,6 +121,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

# Block devices

#

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m
@@ -138,6 +141,7 @@ CONFIG_IOSCHED_NOOP=y 
CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_ATA_OVER_ETH=m



#

# ATA/ATAPI/MFM/RLL support
@@ -172,6 +176,7 @@ CONFIG_SCSI_CONSTANTS=y 
#

# CONFIG_SCSI_SPI_ATTRS is not set

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set



#

# SCSI low-level drivers
@@ -321,8 +326,6 @@ CONFIG_IP_NF_TARGET_NOTRACK=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_IP_NF_COMPAT_IPCHAINS=m

CONFIG_IP_NF_COMPAT_IPFWADM=m



#

# IPv6: Netfilter Configuration
@@ -477,6 +480,7 @@ CONFIG_SOUND_GAMEPORT=y 
CONFIG_SERIO=m

CONFIG_SERIO_SERPORT=m

# CONFIG_SERIO_CT82C710 is not set

CONFIG_SERIO_LIBPS2=m

# CONFIG_SERIO_RAW is not set



#
@@ -595,6 +599,11 @@ CONFIG_DUMMY_CONSOLE=y 
#

# CONFIG_MMC is not set



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# Character devices

#
@@ -614,10 +623,16 @@ CONFIG_REISERFS_FS=m 
# CONFIG_REISERFS_FS_XATTR is not set

CONFIG_JFS_FS=m

# CONFIG_JFS_POSIX_ACL is not set

# CONFIG_JFS_SECURITY is not set

# CONFIG_JFS_DEBUG is not set

# CONFIG_JFS_STATISTICS is not set

CONFIG_FS_POSIX_ACL=y



#

# XFS support

#

CONFIG_XFS_FS=m

CONFIG_XFS_EXPORT=y

# CONFIG_XFS_RT is not set

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_SECURITY is not set
@@ -777,8 +792,9 @@ CONFIG_MAGIC_SYSRQ=y 
# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set



#

# Security options
@@ -814,6 +830,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m 
CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_TEST=m



#

# Hardware crypto devices

#



#

# Library routines

#