Commit 198aa045 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Update defconfigs for 2.6.30-rc3
  m68k,m68knommu: Wire up preadv and pwritev
  scsi: a4000 - Correct driver unregistration in case of failure
parents 58be18c4 adfe7c69

arch/m68k/configs/amiga_defconfig

+104 −59
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.28-rc7

# Tue Dec  2 20:27:42 2008

# Linux kernel version: 2.6.30-rc3

# Wed Apr 22 20:47:52 2009

#

CONFIG_M68K=y

CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y 
CONFIG_SYSVIPC=y

CONFIG_SYSVIPC_SYSCTL=y

CONFIG_POSIX_MQUEUE=y

CONFIG_POSIX_MQUEUE_SYSCTL=y

CONFIG_BSD_PROCESS_ACCT=y

# CONFIG_BSD_PROCESS_ACCT_V3 is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set



#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

# CONFIG_GROUP_SCHED is not set

# CONFIG_CGROUPS is not set

# CONFIG_SYSFS_DEPRECATED_V2 is not set

CONFIG_RELAY=y

CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y 
# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_GZIP=y

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y

# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y 
CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_COMPAT_BRK=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

# CONFIG_SLOW_WORK is not set

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_MODULES=y

# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_LSF is not set

CONFIG_BLK_DEV_BSG=y

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_FREEZER is not set



#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y 
CONFIG_NEED_MULTIPLE_NODES=y

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y



#

# General setup
@@ -157,7 +169,7 @@ CONFIG_BINFMT_AOUT=m 
CONFIG_BINFMT_MISC=m

CONFIG_ZORRO=y

CONFIG_AMIGA_PCMCIA=y

# CONFIG_HEARTBEAT is not set

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y

CONFIG_ISA=y

CONFIG_GENERIC_ISA_DMA=y
@@ -184,7 +196,10 @@ CONFIG_INET=y 
# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_PNP is not set

CONFIG_IP_PNP=y

# CONFIG_IP_PNP_DHCP is not set

# CONFIG_IP_PNP_BOOTP is not set

# CONFIG_IP_PNP_RARP is not set

CONFIG_NET_IPIP=m

CONFIG_NET_IPGRE=m

# CONFIG_ARPD is not set
@@ -258,6 +273,7 @@ CONFIG_NETFILTER_XTABLES=m 
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

CONFIG_NETFILTER_XT_TARGET_DSCP=m

CONFIG_NETFILTER_XT_TARGET_HL=m

CONFIG_NETFILTER_XT_TARGET_MARK=m

CONFIG_NETFILTER_XT_TARGET_NFLOG=m

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -266,6 +282,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m 
CONFIG_NETFILTER_XT_TARGET_TRACE=m

CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

CONFIG_NETFILTER_XT_MATCH_CLUSTER=m

CONFIG_NETFILTER_XT_MATCH_COMMENT=m

CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -276,6 +293,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m 
CONFIG_NETFILTER_XT_MATCH_ESP=m

CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m

CONFIG_NETFILTER_XT_MATCH_HELPER=m

CONFIG_NETFILTER_XT_MATCH_HL=m

CONFIG_NETFILTER_XT_MATCH_IPRANGE=m

CONFIG_NETFILTER_XT_MATCH_LENGTH=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -354,25 +372,20 @@ CONFIG_IP6_NF_MATCH_HL=m 
CONFIG_IP6_NF_MATCH_IPV6HEADER=m

CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_TARGET_LOG=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP_DCCP=m

CONFIG_INET_DCCP_DIAG=m

CONFIG_IP_DCCP_ACKVEC=y



#

# DCCP CCIDs Configuration (EXPERIMENTAL)

#

CONFIG_IP_DCCP_CCID2=m

# CONFIG_IP_DCCP_CCID2_DEBUG is not set

CONFIG_IP_DCCP_CCID3=m

# CONFIG_IP_DCCP_CCID3_DEBUG is not set

CONFIG_IP_DCCP_CCID3_RTO=100

CONFIG_IP_DCCP_TFRC_LIB=m

# CONFIG_IP_DCCP_CCID3 is not set

CONFIG_IP_SCTP=m

# CONFIG_SCTP_DBG_MSG is not set

# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -394,8 +407,10 @@ CONFIG_ATALK=m 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_NET_SCHED is not set

CONFIG_NET_CLS_ROUTE=y

# CONFIG_DCB is not set



#

# Network testing
@@ -406,8 +421,8 @@ CONFIG_NET_CLS_ROUTE=y 
# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

# CONFIG_WIRELESS is not set

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -453,15 +468,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 
CONFIG_ATA_OVER_ETH=m

# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

CONFIG_IDE=y



#

# Please see Documentation/ide/ide.txt for help/info on IDE drives

#

CONFIG_IDE_ATAPI=y

# CONFIG_BLK_DEV_IDE_SATA is not set

CONFIG_IDE_GD=y

CONFIG_IDE_GD_ATA=y
@@ -469,7 +489,6 @@ CONFIG_IDE_GD_ATA=y 
CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y

# CONFIG_BLK_DEV_IDETAPE is not set

# CONFIG_BLK_DEV_IDESCSI is not set

# CONFIG_IDE_TASK_IOCTL is not set

CONFIG_IDE_PROC_FS=y
@@ -478,7 +497,6 @@ CONFIG_IDE_PROC_FS=y 
#

# CONFIG_BLK_DEV_PLATFORM is not set

CONFIG_BLK_DEV_GAYLE=y

CONFIG_BLK_DEV_IDEDOUBLER=y

CONFIG_BLK_DEV_BUDDHA=y

# CONFIG_BLK_DEV_IDEDMA is not set
@@ -530,6 +548,8 @@ CONFIG_ISCSI_TCP=m 
# CONFIG_SCSI_AIC7XXX_OLD is not set

# CONFIG_SCSI_ADVANSYS is not set

# CONFIG_SCSI_IN2000 is not set

# CONFIG_LIBFC is not set

# CONFIG_LIBFCOE is not set

# CONFIG_SCSI_DTC3280 is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -547,6 +567,7 @@ CONFIG_GVP11_SCSI=y 
CONFIG_SCSI_A4000T=y

CONFIG_SCSI_ZORRO7XX=y

# CONFIG_SCSI_DH is not set

# CONFIG_SCSI_OSD_INITIATOR is not set

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

CONFIG_MD_LINEAR=m
@@ -554,7 +575,7 @@ CONFIG_MD_RAID0=m 
CONFIG_MD_RAID1=m

# CONFIG_MD_RAID10 is not set

CONFIG_MD_RAID456=m

CONFIG_MD_RAID5_RESHAPE=y

CONFIG_MD_RAID6_PQ=m

# CONFIG_MD_MULTIPATH is not set

# CONFIG_MD_FAULTY is not set

CONFIG_BLK_DEV_DM=m
@@ -567,6 +588,7 @@ CONFIG_DM_MULTIPATH=m 
# CONFIG_DM_DELAY is not set

CONFIG_DM_UEVENT=y

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_DUMMY=m

# CONFIG_BONDING is not set

CONFIG_MACVLAN=m
@@ -577,14 +599,16 @@ CONFIG_VETH=m 
# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

# CONFIG_MII is not set

CONFIG_ARIADNE=m

CONFIG_A2065=m

CONFIG_HYDRA=m

CONFIG_ZORRO8390=m

CONFIG_APNE=m

CONFIG_ARIADNE=y

CONFIG_A2065=y

CONFIG_HYDRA=y

CONFIG_ZORRO8390=y

CONFIG_APNE=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_SMC is not set

# CONFIG_ETHOC is not set

# CONFIG_NET_VENDOR_RACAL is not set

# CONFIG_DNET is not set

# CONFIG_AT1700 is not set

# CONFIG_DEPCA is not set

# CONFIG_HP100 is not set
@@ -609,7 +633,10 @@ CONFIG_APNE=m 
#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers

#

# CONFIG_WAN is not set

# CONFIG_PLIP is not set

CONFIG_PPP=m
@@ -719,7 +746,7 @@ CONFIG_HW_CONSOLE=y 
CONFIG_VT_HW_CONSOLE_BINDING=y

# CONFIG_DEVKMEM is not set

# CONFIG_SERIAL_NONSTANDARD is not set

CONFIG_A2232=m

CONFIG_A2232=y



#

# Serial drivers
@@ -730,6 +757,7 @@ CONFIG_A2232=m 
# Non-8250 serial port support

#

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

CONFIG_PRINTER=m
@@ -821,6 +849,7 @@ CONFIG_FB_FM2=y 
# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set

# CONFIG_FB_BROADSHEET is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -856,7 +885,6 @@ CONFIG_HIDRAW=y 
#

# Special HID drivers

#

CONFIG_HID_COMPAT=y

# CONFIG_USB_SUPPORT is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set
@@ -867,14 +895,13 @@ CONFIG_HID_COMPAT=y 
# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

CONFIG_STAGING_EXCLUDE_BUILD=y



#

# Character devices

#

CONFIG_AMIGA_BUILTIN_SERIAL=y

CONFIG_MULTIFACE_III_TTY=m

# CONFIG_SERIAL_CONSOLE is not set

CONFIG_SERIAL_CONSOLE=y



#

# File systems
@@ -883,6 +910,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

# CONFIG_EXT3_FS_XATTR is not set

# CONFIG_EXT4_FS is not set

CONFIG_JBD=y
@@ -909,13 +937,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m 
# CONFIG_OCFS2_FS_STATS is not set

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

# CONFIG_OCFS2_DEBUG_FS is not set

# CONFIG_OCFS2_COMPAT_JBD is not set

# CONFIG_OCFS2_FS_POSIX_ACL is not set

# CONFIG_BTRFS_FS is not set

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_QUOTA_TREE=m

# CONFIG_QFMT_V1 is not set

# CONFIG_QFMT_V2 is not set

CONFIG_QUOTACTL=y
@@ -923,6 +953,11 @@ CONFIG_AUTOFS_FS=m 
CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m



#

# Caches

#

# CONFIG_FSCACHE is not set



#

# CD-ROM/DVD Filesystems

#
@@ -935,8 +970,8 @@ CONFIG_UDF_NLS=y 
#

# DOS/FAT/NT Filesystems

#

CONFIG_FAT_FS=m

CONFIG_MSDOS_FS=m

CONFIG_FAT_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=m

CONFIG_FAT_DEFAULT_CODEPAGE=437

CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -954,10 +989,7 @@ CONFIG_TMPFS=y 
# CONFIG_TMPFS_POSIX_ACL is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_CONFIGFS_FS=m



#

# Miscellaneous filesystems

#

CONFIG_MISC_FILESYSTEMS=y

# CONFIG_ADFS_FS is not set

CONFIG_AFFS_FS=m

CONFIG_HFS_FS=m
@@ -966,6 +998,9 @@ CONFIG_HFSPLUS_FS=m 
# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

# CONFIG_SQUASHFS_EMBEDDED is not set

CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

# CONFIG_VXFS_FS is not set

CONFIG_MINIX_FS=y

# CONFIG_OMFS_FS is not set
@@ -976,23 +1011,24 @@ CONFIG_SYSV_FS=m 
CONFIG_UFS_FS=m

# CONFIG_UFS_FS_WRITE is not set

# CONFIG_UFS_DEBUG is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

CONFIG_NFS_V4=y

# CONFIG_ROOT_NFS is not set

CONFIG_NFSD=m

CONFIG_NFSD_V3=y

# CONFIG_NFSD_V3_ACL is not set

# CONFIG_NFSD_V4 is not set

CONFIG_LOCKD=m

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_EXPORTFS=m

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=m

CONFIG_SUNRPC_GSS=m

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=m

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

CONFIG_SMB_FS=m

CONFIG_SMB_NLS_DEFAULT=y
@@ -1067,11 +1103,6 @@ CONFIG_DEBUG_BUGVERBOSE=y 
CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y



#

# Tracers

#

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_SAMPLES is not set



#
@@ -1092,13 +1123,21 @@ CONFIG_CRYPTO=y 
#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_ALGAPI2=y

CONFIG_CRYPTO_AEAD=m

CONFIG_CRYPTO_AEAD2=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_BLKCIPHER2=y

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_RNG=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG=m

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_PCOMP=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

CONFIG_CRYPTO_GF128MUL=m

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_WORKQUEUE=y

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_AUTHENC=m

CONFIG_CRYPTO_TEST=m
@@ -1113,7 +1152,7 @@ CONFIG_CRYPTO_SEQIV=m 
#

# Block modes

#

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_CTR=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_ECB=m
@@ -1132,7 +1171,7 @@ CONFIG_CRYPTO_XCBC=m 
#

CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m
@@ -1154,7 +1193,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -1168,6 +1207,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m 
# Compression

#

CONFIG_CRYPTO_DEFLATE=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m



#
@@ -1175,11 +1215,13 @@ CONFIG_CRYPTO_LZO=m 
#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

# CONFIG_BINARY_PRINTF is not set



#

# Library routines

#

CONFIG_BITREVERSE=y

CONFIG_GENERIC_FIND_LAST_BIT=y

CONFIG_CRC_CCITT=m

CONFIG_CRC16=m

CONFIG_CRC_T10DIF=y
@@ -1191,10 +1233,13 @@ CONFIG_ZLIB_INFLATE=y 
CONFIG_ZLIB_DEFLATE=m

CONFIG_LZO_COMPRESS=m

CONFIG_LZO_DECOMPRESS=m

CONFIG_DECOMPRESS_GZIP=y

CONFIG_DECOMPRESS_BZIP2=y

CONFIG_DECOMPRESS_LZMA=y

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_DMA=y

CONFIG_NLATTR=y

arch/m68k/configs/apollo_defconfig

+81 −39
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.28-rc7

# Tue Dec  2 20:27:43 2008

# Linux kernel version: 2.6.30-rc3

# Wed Apr 22 20:47:54 2009

#

CONFIG_M68K=y

CONFIG_MMU=y
@@ -29,14 +29,24 @@ CONFIG_SWAP=y 
CONFIG_SYSVIPC=y

CONFIG_SYSVIPC_SYSCTL=y

CONFIG_POSIX_MQUEUE=y

CONFIG_POSIX_MQUEUE_SYSCTL=y

CONFIG_BSD_PROCESS_ACCT=y

# CONFIG_BSD_PROCESS_ACCT_V3 is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set



#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

# CONFIG_GROUP_SCHED is not set

# CONFIG_CGROUPS is not set

# CONFIG_SYSFS_DEPRECATED_V2 is not set

CONFIG_RELAY=y

CONFIG_NAMESPACES=y
@@ -44,23 +54,27 @@ CONFIG_NAMESPACES=y 
# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_GZIP=y

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y

# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y
@@ -68,15 +82,16 @@ CONFIG_EVENTFD=y 
CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_COMPAT_BRK=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

# CONFIG_SLOW_WORK is not set

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_MODULES=y

# CONFIG_MODULE_FORCE_LOAD is not set
@@ -84,11 +99,8 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_LSF is not set

CONFIG_BLK_DEV_BSG=y

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -104,7 +116,6 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_FREEZER is not set



#
@@ -140,12 +151,13 @@ CONFIG_FLAT_NODE_MEM_MAP=y 
CONFIG_NEED_MULTIPLE_NODES=y

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y



#

# General setup
@@ -256,6 +268,7 @@ CONFIG_NETFILTER_XTABLES=m 
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

CONFIG_NETFILTER_XT_TARGET_DSCP=m

CONFIG_NETFILTER_XT_TARGET_HL=m

CONFIG_NETFILTER_XT_TARGET_MARK=m

CONFIG_NETFILTER_XT_TARGET_NFLOG=m

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -264,6 +277,7 @@ CONFIG_NETFILTER_XT_TARGET_RATEEST=m 
CONFIG_NETFILTER_XT_TARGET_TRACE=m

CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

CONFIG_NETFILTER_XT_MATCH_CLUSTER=m

CONFIG_NETFILTER_XT_MATCH_COMMENT=m

CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -274,6 +288,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m 
CONFIG_NETFILTER_XT_MATCH_ESP=m

CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m

CONFIG_NETFILTER_XT_MATCH_HELPER=m

CONFIG_NETFILTER_XT_MATCH_HL=m

CONFIG_NETFILTER_XT_MATCH_IPRANGE=m

CONFIG_NETFILTER_XT_MATCH_LENGTH=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -352,25 +367,20 @@ CONFIG_IP6_NF_MATCH_HL=m 
CONFIG_IP6_NF_MATCH_IPV6HEADER=m

CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_TARGET_LOG=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP_DCCP=m

CONFIG_INET_DCCP_DIAG=m

CONFIG_IP_DCCP_ACKVEC=y



#

# DCCP CCIDs Configuration (EXPERIMENTAL)

#

CONFIG_IP_DCCP_CCID2=m

# CONFIG_IP_DCCP_CCID2_DEBUG is not set

CONFIG_IP_DCCP_CCID3=m

# CONFIG_IP_DCCP_CCID3_DEBUG is not set

CONFIG_IP_DCCP_CCID3_RTO=100

CONFIG_IP_DCCP_TFRC_LIB=m

# CONFIG_IP_DCCP_CCID3 is not set

CONFIG_IP_SCTP=m

# CONFIG_SCTP_DBG_MSG is not set

# CONFIG_SCTP_DBG_OBJCNT is not set
@@ -392,8 +402,10 @@ CONFIG_ATALK=m 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_NET_SCHED is not set

CONFIG_NET_CLS_ROUTE=y

# CONFIG_DCB is not set



#

# Network testing
@@ -404,8 +416,8 @@ CONFIG_NET_CLS_ROUTE=y 
# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

# CONFIG_WIRELESS is not set

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -441,9 +453,13 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 
CONFIG_ATA_OVER_ETH=m

# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -491,8 +507,11 @@ CONFIG_SCSI_SRP_ATTRS=m 
CONFIG_SCSI_SRP_TGT_ATTRS=y

CONFIG_SCSI_LOWLEVEL=y

CONFIG_ISCSI_TCP=m

# CONFIG_LIBFC is not set

# CONFIG_LIBFCOE is not set

# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_DH is not set

# CONFIG_SCSI_OSD_INITIATOR is not set

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

CONFIG_MD_LINEAR=m
@@ -500,7 +519,7 @@ CONFIG_MD_RAID0=m 
CONFIG_MD_RAID1=m

# CONFIG_MD_RAID10 is not set

CONFIG_MD_RAID456=m

CONFIG_MD_RAID5_RESHAPE=y

CONFIG_MD_RAID6_PQ=m

# CONFIG_MD_MULTIPATH is not set

# CONFIG_MD_FAULTY is not set

CONFIG_BLK_DEV_DM=m
@@ -513,6 +532,7 @@ CONFIG_DM_MULTIPATH=m 
# CONFIG_DM_DELAY is not set

CONFIG_DM_UEVENT=y

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_DUMMY=m

# CONFIG_BONDING is not set

CONFIG_MACVLAN=m
@@ -522,6 +542,8 @@ CONFIG_VETH=m 
# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

# CONFIG_MII is not set

# CONFIG_ETHOC is not set

# CONFIG_DNET is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -538,7 +560,10 @@ CONFIG_NET_ETHERNET=y 
#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers

#

# CONFIG_WAN is not set

CONFIG_PPP=m

# CONFIG_PPP_MULTILINK is not set
@@ -596,7 +621,6 @@ CONFIG_MOUSE_PS2=m 
CONFIG_MOUSE_PS2_ALPS=y

CONFIG_MOUSE_PS2_LOGIPS2PP=y

CONFIG_MOUSE_PS2_SYNAPTICS=y

CONFIG_MOUSE_PS2_LIFEBOOK=y

CONFIG_MOUSE_PS2_TRACKPOINT=y

# CONFIG_MOUSE_PS2_ELANTECH is not set

# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -636,6 +660,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y 
# Non-8250 serial port support

#

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_IPMI_HANDLER is not set
@@ -718,6 +743,7 @@ CONFIG_FB_APOLLO=y 
# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set

# CONFIG_FB_BROADSHEET is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -749,7 +775,6 @@ CONFIG_HIDRAW=y 
#

# Special HID drivers

#

CONFIG_HID_COMPAT=y

# CONFIG_USB_SUPPORT is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set
@@ -757,9 +782,9 @@ CONFIG_HID_COMPAT=y 
# CONFIG_ACCESSIBILITY is not set

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

CONFIG_STAGING_EXCLUDE_BUILD=y



#

# Character devices
@@ -774,6 +799,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

# CONFIG_EXT3_FS_XATTR is not set

# CONFIG_EXT4_FS is not set

CONFIG_JBD=y
@@ -800,13 +826,15 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m 
# CONFIG_OCFS2_FS_STATS is not set

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

# CONFIG_OCFS2_DEBUG_FS is not set

# CONFIG_OCFS2_COMPAT_JBD is not set

# CONFIG_OCFS2_FS_POSIX_ACL is not set

# CONFIG_BTRFS_FS is not set

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_QUOTA_TREE=m

# CONFIG_QFMT_V1 is not set

# CONFIG_QFMT_V2 is not set

CONFIG_QUOTACTL=y
@@ -814,6 +842,11 @@ CONFIG_AUTOFS_FS=m 
CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m



#

# Caches

#

# CONFIG_FSCACHE is not set



#

# CD-ROM/DVD Filesystems

#
@@ -845,10 +878,7 @@ CONFIG_TMPFS=y 
# CONFIG_TMPFS_POSIX_ACL is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_CONFIGFS_FS=m



#

# Miscellaneous filesystems

#

CONFIG_MISC_FILESYSTEMS=y

# CONFIG_ADFS_FS is not set

CONFIG_AFFS_FS=m

CONFIG_HFS_FS=m
@@ -857,6 +887,9 @@ CONFIG_HFSPLUS_FS=m 
# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

# CONFIG_SQUASHFS_EMBEDDED is not set

CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

# CONFIG_VXFS_FS is not set

CONFIG_MINIX_FS=y

# CONFIG_OMFS_FS is not set
@@ -867,6 +900,7 @@ CONFIG_SYSV_FS=m 
CONFIG_UFS_FS=m

# CONFIG_UFS_FS_WRITE is not set

# CONFIG_UFS_DEBUG is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -883,7 +917,6 @@ CONFIG_EXPORTFS=m 
CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

CONFIG_SMB_FS=m
@@ -958,11 +991,6 @@ CONFIG_DEBUG_BUGVERBOSE=y 
CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y



#

# Tracers

#

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_SAMPLES is not set



#
@@ -983,13 +1011,21 @@ CONFIG_CRYPTO=y 
#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_ALGAPI2=y

CONFIG_CRYPTO_AEAD=m

CONFIG_CRYPTO_AEAD2=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_BLKCIPHER2=y

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_RNG=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG=m

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_PCOMP=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

CONFIG_CRYPTO_GF128MUL=m

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_WORKQUEUE=y

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_AUTHENC=m

CONFIG_CRYPTO_TEST=m
@@ -1059,6 +1095,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m 
# Compression

#

CONFIG_CRYPTO_DEFLATE=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m



#
@@ -1066,11 +1103,13 @@ CONFIG_CRYPTO_LZO=m 
#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

# CONFIG_BINARY_PRINTF is not set



#

# Library routines

#

CONFIG_BITREVERSE=y

CONFIG_GENERIC_FIND_LAST_BIT=y

CONFIG_CRC_CCITT=m

CONFIG_CRC16=m

CONFIG_CRC_T10DIF=y
@@ -1082,10 +1121,13 @@ CONFIG_ZLIB_INFLATE=y 
CONFIG_ZLIB_DEFLATE=m

CONFIG_LZO_COMPRESS=m

CONFIG_LZO_DECOMPRESS=m

CONFIG_DECOMPRESS_GZIP=y

CONFIG_DECOMPRESS_BZIP2=y

CONFIG_DECOMPRESS_LZMA=y

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_DMA=y

CONFIG_NLATTR=y

arch/m68k/configs/atari_defconfig

+101 −54

File changed.

Preview size limit exceeded, changes collapsed.

arch/m68k/configs/bvme6000_defconfig

+80 −39

File changed.

Preview size limit exceeded, changes collapsed.

arch/m68k/configs/hp300_defconfig

+81 −39

File changed.

Preview size limit exceeded, changes collapsed.