ia64/xen-unstable

changeset 3070:1e3e3846e8d7

bitkeeper revision 1.1159.179.16 (419e55293A-xJW0Y2c6IGELhIGnRUg)

xenU_defconfig, xen0_defconfig:
Update for linux-2.6.10-rc2.
author cl349@arcadians.cl.cam.ac.uk
date Fri Nov 19 20:18:49 2004 +0000 (2004-11-19)
parents c52145d62855
children 13728122c78d
files linux-2.6.10-rc2-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.10-rc2-xen-sparse/arch/xen/configs/xenU_defconfig
line diff
     1.1 --- a/linux-2.6.10-rc2-xen-sparse/arch/xen/configs/xen0_defconfig	Fri Nov 19 18:53:59 2004 +0000
     1.2 +++ b/linux-2.6.10-rc2-xen-sparse/arch/xen/configs/xen0_defconfig	Fri Nov 19 20:18:49 2004 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 -# Linux kernel version: 2.6.9-xen0
     1.7 -# Sun Nov 14 16:55:05 2004
     1.8 +# Linux kernel version: 2.6.10-rc2-xen0
     1.9 +# Fri Nov 19 20:16:38 2004
    1.10  #
    1.11  CONFIG_XEN=y
    1.12  CONFIG_ARCH_XEN=y
    1.13 @@ -30,6 +30,7 @@ CONFIG_EXPERIMENTAL=y
    1.14  # CONFIG_CLEAN_COMPILE is not set
    1.15  CONFIG_BROKEN=y
    1.16  CONFIG_BROKEN_ON_SMP=y
    1.17 +CONFIG_LOCK_KERNEL=y
    1.18  
    1.19  #
    1.20  # General setup
    1.21 @@ -43,6 +44,7 @@ CONFIG_SYSCTL=y
    1.22  # CONFIG_AUDIT is not set
    1.23  CONFIG_LOG_BUF_SHIFT=14
    1.24  CONFIG_HOTPLUG=y
    1.25 +CONFIG_KOBJECT_UEVENT=y
    1.26  # CONFIG_IKCONFIG is not set
    1.27  # CONFIG_EMBEDDED is not set
    1.28  CONFIG_KALLSYMS=y
    1.29 @@ -50,12 +52,12 @@ CONFIG_KALLSYMS=y
    1.30  # CONFIG_KALLSYMS_EXTRA_PASS is not set
    1.31  CONFIG_FUTEX=y
    1.32  CONFIG_EPOLL=y
    1.33 -CONFIG_IOSCHED_NOOP=y
    1.34 -CONFIG_IOSCHED_AS=y
    1.35 -CONFIG_IOSCHED_DEADLINE=y
    1.36 -CONFIG_IOSCHED_CFQ=y
    1.37  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
    1.38  CONFIG_SHMEM=y
    1.39 +CONFIG_CC_ALIGN_FUNCTIONS=0
    1.40 +CONFIG_CC_ALIGN_LABELS=0
    1.41 +CONFIG_CC_ALIGN_LOOPS=0
    1.42 +CONFIG_CC_ALIGN_JUMPS=0
    1.43  # CONFIG_TINY_SHMEM is not set
    1.44  
    1.45  #
    1.46 @@ -66,6 +68,7 @@ CONFIG_MODULE_UNLOAD=y
    1.47  # CONFIG_MODULE_FORCE_UNLOAD is not set
    1.48  CONFIG_OBSOLETE_MODPARM=y
    1.49  # CONFIG_MODVERSIONS is not set
    1.50 +# CONFIG_MODULE_SRCVERSION_ALL is not set
    1.51  CONFIG_KMOD=y
    1.52  
    1.53  #
    1.54 @@ -75,6 +78,7 @@ CONFIG_XENARCH="i386"
    1.55  CONFIG_MMU=y
    1.56  CONFIG_UID16=y
    1.57  CONFIG_GENERIC_ISA_DMA=y
    1.58 +CONFIG_GENERIC_IOMAP=y
    1.59  # CONFIG_M686 is not set
    1.60  # CONFIG_MPENTIUMII is not set
    1.61  # CONFIG_MPENTIUMIII is not set
    1.62 @@ -126,16 +130,13 @@ CONFIG_ISA=y
    1.63  # CONFIG_SCx200 is not set
    1.64  
    1.65  #
    1.66 -# PCMCIA/CardBus support
    1.67 +# PCCARD (PCMCIA/CardBus) support
    1.68  #
    1.69 -CONFIG_PCMCIA=m
    1.70 -# CONFIG_PCMCIA_DEBUG is not set
    1.71 -CONFIG_YENTA=m
    1.72 -CONFIG_CARDBUS=y
    1.73 -# CONFIG_PD6729 is not set
    1.74 -# CONFIG_I82092 is not set
    1.75 -# CONFIG_I82365 is not set
    1.76 -# CONFIG_TCIC is not set
    1.77 +# CONFIG_PCCARD is not set
    1.78 +
    1.79 +#
    1.80 +# PC-card bridges
    1.81 +#
    1.82  CONFIG_PCMCIA_PROBE=y
    1.83  
    1.84  #
    1.85 @@ -158,8 +159,9 @@ CONFIG_MAGIC_SYSRQ=y
    1.86  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    1.87  # CONFIG_FRAME_POINTER is not set
    1.88  # CONFIG_4KSTACKS is not set
    1.89 +CONFIG_GENERIC_HARDIRQS=y
    1.90 +CONFIG_GENERIC_IRQ_PROBE=y
    1.91  CONFIG_X86_BIOS_REBOOT=y
    1.92 -CONFIG_X86_STD_RESOURCES=y
    1.93  CONFIG_PC=y
    1.94  
    1.95  #
    1.96 @@ -213,7 +215,17 @@ CONFIG_BLK_DEV_LOOP=y
    1.97  CONFIG_BLK_DEV_RAM=y
    1.98  CONFIG_BLK_DEV_RAM_SIZE=4096
    1.99  CONFIG_BLK_DEV_INITRD=y
   1.100 +CONFIG_INITRAMFS_SOURCE=""
   1.101  # CONFIG_LBD is not set
   1.102 +# CONFIG_CDROM_PKTCDVD is not set
   1.103 +
   1.104 +#
   1.105 +# IO Schedulers
   1.106 +#
   1.107 +CONFIG_IOSCHED_NOOP=y
   1.108 +CONFIG_IOSCHED_AS=y
   1.109 +CONFIG_IOSCHED_DEADLINE=y
   1.110 +CONFIG_IOSCHED_CFQ=y
   1.111  
   1.112  #
   1.113  # ATA/ATAPI/MFM/RLL support
   1.114 @@ -228,13 +240,11 @@ CONFIG_BLK_DEV_IDE=y
   1.115  # CONFIG_BLK_DEV_HD_IDE is not set
   1.116  CONFIG_BLK_DEV_IDEDISK=y
   1.117  # CONFIG_IDEDISK_MULTI_MODE is not set
   1.118 -# CONFIG_BLK_DEV_IDECS is not set
   1.119  CONFIG_BLK_DEV_IDECD=y
   1.120  # CONFIG_BLK_DEV_IDETAPE is not set
   1.121  # CONFIG_BLK_DEV_IDEFLOPPY is not set
   1.122  # CONFIG_BLK_DEV_IDESCSI is not set
   1.123  # CONFIG_IDE_TASK_IOCTL is not set
   1.124 -# CONFIG_IDE_TASKFILE_IO is not set
   1.125  
   1.126  #
   1.127  # IDE chipset support/bugfixes
   1.128 @@ -338,6 +348,7 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y
   1.129  # CONFIG_MEGARAID_NEWGEN is not set
   1.130  # CONFIG_MEGARAID_LEGACY is not set
   1.131  CONFIG_SCSI_SATA=y
   1.132 +# CONFIG_SCSI_SATA_AHCI is not set
   1.133  # CONFIG_SCSI_SATA_SVW is not set
   1.134  CONFIG_SCSI_ATA_PIIX=y
   1.135  # CONFIG_SCSI_SATA_NV is not set
   1.136 @@ -345,6 +356,7 @@ CONFIG_SCSI_SATA_PROMISE=y
   1.137  CONFIG_SCSI_SATA_SX4=y
   1.138  CONFIG_SCSI_SATA_SIL=y
   1.139  # CONFIG_SCSI_SATA_SIS is not set
   1.140 +# CONFIG_SCSI_SATA_ULI is not set
   1.141  # CONFIG_SCSI_SATA_VIA is not set
   1.142  # CONFIG_SCSI_SATA_VITESSE is not set
   1.143  CONFIG_SCSI_BUSLOGIC=y
   1.144 @@ -372,6 +384,7 @@ CONFIG_SCSI_BUSLOGIC=y
   1.145  # CONFIG_SCSI_QLOGIC_ISP is not set
   1.146  # CONFIG_SCSI_QLOGIC_FC is not set
   1.147  # CONFIG_SCSI_QLOGIC_1280 is not set
   1.148 +# CONFIG_SCSI_QLOGIC_1280_1040 is not set
   1.149  CONFIG_SCSI_QLA2XXX=y
   1.150  # CONFIG_SCSI_QLA21XX is not set
   1.151  # CONFIG_SCSI_QLA22XX is not set
   1.152 @@ -390,15 +403,6 @@ CONFIG_SCSI_QLA2XXX=y
   1.153  # CONFIG_SCSI_DEBUG is not set
   1.154  
   1.155  #
   1.156 -# PCMCIA SCSI adapter support
   1.157 -#
   1.158 -# CONFIG_PCMCIA_AHA152X is not set
   1.159 -# CONFIG_PCMCIA_FDOMAIN is not set
   1.160 -# CONFIG_PCMCIA_NINJA_SCSI is not set
   1.161 -# CONFIG_PCMCIA_QLOGIC is not set
   1.162 -# CONFIG_PCMCIA_SYM53C500 is not set
   1.163 -
   1.164 -#
   1.165  # Old CD-ROM drivers (not SCSI, not IDE)
   1.166  #
   1.167  # CONFIG_CD_NO_IDESCSI is not set
   1.168 @@ -415,6 +419,7 @@ CONFIG_MD_RAID1=y
   1.169  CONFIG_MD_RAID5=y
   1.170  # CONFIG_MD_RAID6 is not set
   1.171  # CONFIG_MD_MULTIPATH is not set
   1.172 +# CONFIG_MD_FAULTY is not set
   1.173  CONFIG_BLK_DEV_DM=y
   1.174  # CONFIG_DM_CRYPT is not set
   1.175  CONFIG_DM_SNAPSHOT=y
   1.176 @@ -464,6 +469,8 @@ CONFIG_IP_PNP_DHCP=y
   1.177  # CONFIG_INET_ESP is not set
   1.178  # CONFIG_INET_IPCOMP is not set
   1.179  # CONFIG_INET_TUNNEL is not set
   1.180 +CONFIG_IP_TCPDIAG=y
   1.181 +# CONFIG_IP_TCPDIAG_IPV6 is not set
   1.182  
   1.183  #
   1.184  # IP: Virtual Server Configuration
   1.185 @@ -479,6 +486,7 @@ CONFIG_BRIDGE_NETFILTER=y
   1.186  #
   1.187  CONFIG_IP_NF_CONNTRACK=m
   1.188  CONFIG_IP_NF_CT_ACCT=y
   1.189 +# CONFIG_IP_NF_CONNTRACK_MARK is not set
   1.190  # CONFIG_IP_NF_CT_PROTO_SCTP is not set
   1.191  CONFIG_IP_NF_FTP=m
   1.192  # CONFIG_IP_NF_IRC is not set
   1.193 @@ -509,6 +517,7 @@ CONFIG_IP_NF_IPTABLES=m
   1.194  # CONFIG_IP_NF_MATCH_REALM is not set
   1.195  # CONFIG_IP_NF_MATCH_SCTP is not set
   1.196  # CONFIG_IP_NF_MATCH_COMMENT is not set
   1.197 +# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
   1.198  # CONFIG_IP_NF_FILTER is not set
   1.199  # CONFIG_IP_NF_TARGET_LOG is not set
   1.200  # CONFIG_IP_NF_TARGET_ULOG is not set
   1.201 @@ -541,7 +550,6 @@ CONFIG_BRIDGE=y
   1.202  # CONFIG_NET_DIVERT is not set
   1.203  # CONFIG_ECONET is not set
   1.204  # CONFIG_WAN_ROUTER is not set
   1.205 -# CONFIG_NET_HW_FLOWCONTROL is not set
   1.206  
   1.207  #
   1.208  # QoS and/or fair queueing
   1.209 @@ -601,8 +609,6 @@ CONFIG_TULIP=y
   1.210  # CONFIG_DE4X5 is not set
   1.211  # CONFIG_WINBOND_840 is not set
   1.212  # CONFIG_DM9102 is not set
   1.213 -# CONFIG_PCMCIA_XIRCOM is not set
   1.214 -# CONFIG_PCMCIA_XIRTULIP is not set
   1.215  # CONFIG_AT1700 is not set
   1.216  # CONFIG_DEPCA is not set
   1.217  # CONFIG_HP100 is not set
   1.218 @@ -635,7 +641,6 @@ CONFIG_8139TOO_PIO=y
   1.219  # CONFIG_TLAN is not set
   1.220  CONFIG_VIA_RHINE=y
   1.221  # CONFIG_VIA_RHINE_MMIO is not set
   1.222 -# CONFIG_VIA_VELOCITY is not set
   1.223  # CONFIG_NET_POCKET is not set
   1.224  
   1.225  #
   1.226 @@ -651,6 +656,7 @@ CONFIG_E1000=y
   1.227  # CONFIG_YELLOWFIN is not set
   1.228  # CONFIG_R8169 is not set
   1.229  # CONFIG_SK98LIN is not set
   1.230 +# CONFIG_VIA_VELOCITY is not set
   1.231  CONFIG_TIGON3=y
   1.232  
   1.233  #
   1.234 @@ -670,11 +676,6 @@ CONFIG_TIGON3=y
   1.235  # CONFIG_NET_RADIO is not set
   1.236  
   1.237  #
   1.238 -# PCMCIA network device support
   1.239 -#
   1.240 -# CONFIG_NET_PCMCIA is not set
   1.241 -
   1.242 -#
   1.243  # Wan interfaces
   1.244  #
   1.245  # CONFIG_WAN is not set
   1.246 @@ -789,11 +790,6 @@ CONFIG_LEGACY_PTY_COUNT=256
   1.247  # CONFIG_FTAPE is not set
   1.248  # CONFIG_AGP is not set
   1.249  # CONFIG_DRM is not set
   1.250 -
   1.251 -#
   1.252 -# PCMCIA character devices
   1.253 -#
   1.254 -# CONFIG_SYNCLINK_CS is not set
   1.255  # CONFIG_MWAVE is not set
   1.256  # CONFIG_RAW_DRIVER is not set
   1.257  # CONFIG_HANGCHECK_TIMER is not set
   1.258 @@ -845,6 +841,8 @@ CONFIG_DUMMY_CONSOLE=y
   1.259  # USB support
   1.260  #
   1.261  # CONFIG_USB is not set
   1.262 +CONFIG_USB_ARCH_HAS_HCD=y
   1.263 +CONFIG_USB_ARCH_HAS_OHCI=y
   1.264  
   1.265  #
   1.266  # USB Gadget Support
   1.267 @@ -872,6 +870,7 @@ CONFIG_REISERFS_FS=y
   1.268  # CONFIG_MINIX_FS is not set
   1.269  # CONFIG_ROMFS_FS is not set
   1.270  # CONFIG_QUOTA is not set
   1.271 +CONFIG_DNOTIFY=y
   1.272  # CONFIG_AUTOFS_FS is not set
   1.273  # CONFIG_AUTOFS4_FS is not set
   1.274  
   1.275 @@ -903,6 +902,7 @@ CONFIG_SYSFS=y
   1.276  # CONFIG_DEVFS_FS is not set
   1.277  # CONFIG_DEVPTS_FS_XATTR is not set
   1.278  CONFIG_TMPFS=y
   1.279 +# CONFIG_TMPFS_XATTR is not set
   1.280  # CONFIG_HUGETLBFS is not set
   1.281  # CONFIG_HUGETLB_PAGE is not set
   1.282  CONFIG_RAMFS=y
   1.283 @@ -1001,6 +1001,7 @@ CONFIG_NLS_ISO8859_1=y
   1.284  #
   1.285  # Security options
   1.286  #
   1.287 +# CONFIG_KEYS is not set
   1.288  # CONFIG_SECURITY is not set
   1.289  
   1.290  #
   1.291 @@ -1025,6 +1026,7 @@ CONFIG_CRYPTO_DES=m
   1.292  # CONFIG_CRYPTO_TEA is not set
   1.293  # CONFIG_CRYPTO_ARC4 is not set
   1.294  # CONFIG_CRYPTO_KHAZAD is not set
   1.295 +# CONFIG_CRYPTO_ANUBIS is not set
   1.296  # CONFIG_CRYPTO_DEFLATE is not set
   1.297  # CONFIG_CRYPTO_MICHAEL_MIC is not set
   1.298  CONFIG_CRYPTO_CRC32C=m
     2.1 --- a/linux-2.6.10-rc2-xen-sparse/arch/xen/configs/xenU_defconfig	Fri Nov 19 18:53:59 2004 +0000
     2.2 +++ b/linux-2.6.10-rc2-xen-sparse/arch/xen/configs/xenU_defconfig	Fri Nov 19 20:18:49 2004 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6 -# Linux kernel version: 2.6.9-xen0
     2.7 -# Sun Oct 31 21:32:23 2004
     2.8 +# Linux kernel version: 2.6.10-rc2-xenU
     2.9 +# Fri Nov 19 20:16:52 2004
    2.10  #
    2.11  CONFIG_XEN=y
    2.12  CONFIG_ARCH_XEN=y
    2.13 @@ -29,6 +29,7 @@ CONFIG_X86=y
    2.14  CONFIG_EXPERIMENTAL=y
    2.15  CONFIG_CLEAN_COMPILE=y
    2.16  CONFIG_BROKEN_ON_SMP=y
    2.17 +CONFIG_LOCK_KERNEL=y
    2.18  
    2.19  #
    2.20  # General setup
    2.21 @@ -42,18 +43,19 @@ CONFIG_SYSCTL=y
    2.22  # CONFIG_AUDIT is not set
    2.23  CONFIG_LOG_BUF_SHIFT=14
    2.24  CONFIG_HOTPLUG=y
    2.25 +CONFIG_KOBJECT_UEVENT=y
    2.26  # CONFIG_IKCONFIG is not set
    2.27  # CONFIG_EMBEDDED is not set
    2.28  CONFIG_KALLSYMS=y
    2.29  # CONFIG_KALLSYMS_EXTRA_PASS is not set
    2.30  CONFIG_FUTEX=y
    2.31  CONFIG_EPOLL=y
    2.32 -CONFIG_IOSCHED_NOOP=y
    2.33 -CONFIG_IOSCHED_AS=y
    2.34 -CONFIG_IOSCHED_DEADLINE=y
    2.35 -CONFIG_IOSCHED_CFQ=y
    2.36  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
    2.37  CONFIG_SHMEM=y
    2.38 +CONFIG_CC_ALIGN_FUNCTIONS=0
    2.39 +CONFIG_CC_ALIGN_LABELS=0
    2.40 +CONFIG_CC_ALIGN_LOOPS=0
    2.41 +CONFIG_CC_ALIGN_JUMPS=0
    2.42  # CONFIG_TINY_SHMEM is not set
    2.43  
    2.44  #
    2.45 @@ -64,6 +66,7 @@ CONFIG_MODULE_UNLOAD=y
    2.46  # CONFIG_MODULE_FORCE_UNLOAD is not set
    2.47  CONFIG_OBSOLETE_MODPARM=y
    2.48  # CONFIG_MODVERSIONS is not set
    2.49 +# CONFIG_MODULE_SRCVERSION_ALL is not set
    2.50  CONFIG_KMOD=y
    2.51  
    2.52  #
    2.53 @@ -73,6 +76,7 @@ CONFIG_XENARCH="i386"
    2.54  CONFIG_MMU=y
    2.55  CONFIG_UID16=y
    2.56  CONFIG_GENERIC_ISA_DMA=y
    2.57 +CONFIG_GENERIC_IOMAP=y
    2.58  # CONFIG_M686 is not set
    2.59  # CONFIG_MPENTIUMII is not set
    2.60  # CONFIG_MPENTIUMIII is not set
    2.61 @@ -119,8 +123,9 @@ CONFIG_EARLY_PRINTK=y
    2.62  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    2.63  # CONFIG_FRAME_POINTER is not set
    2.64  # CONFIG_4KSTACKS is not set
    2.65 +CONFIG_GENERIC_HARDIRQS=y
    2.66 +CONFIG_GENERIC_IRQ_PROBE=y
    2.67  CONFIG_X86_BIOS_REBOOT=y
    2.68 -CONFIG_X86_STD_RESOURCES=y
    2.69  CONFIG_PC=y
    2.70  
    2.71  #
    2.72 @@ -151,7 +156,17 @@ CONFIG_BLK_DEV_NBD=m
    2.73  CONFIG_BLK_DEV_RAM=y
    2.74  CONFIG_BLK_DEV_RAM_SIZE=4096
    2.75  CONFIG_BLK_DEV_INITRD=y
    2.76 +CONFIG_INITRAMFS_SOURCE=""
    2.77  # CONFIG_LBD is not set
    2.78 +# CONFIG_CDROM_PKTCDVD is not set
    2.79 +
    2.80 +#
    2.81 +# IO Schedulers
    2.82 +#
    2.83 +CONFIG_IOSCHED_NOOP=y
    2.84 +CONFIG_IOSCHED_AS=y
    2.85 +CONFIG_IOSCHED_DEADLINE=y
    2.86 +CONFIG_IOSCHED_CFQ=y
    2.87  
    2.88  #
    2.89  # SCSI device support
    2.90 @@ -185,6 +200,7 @@ CONFIG_BLK_DEV_SD=m
    2.91  # SCSI low-level drivers
    2.92  #
    2.93  # CONFIG_SCSI_SATA is not set
    2.94 +# CONFIG_SCSI_QLOGIC_1280_1040 is not set
    2.95  # CONFIG_SCSI_DEBUG is not set
    2.96  
    2.97  #
    2.98 @@ -220,6 +236,8 @@ CONFIG_IP_PNP=y
    2.99  # CONFIG_INET_ESP is not set
   2.100  # CONFIG_INET_IPCOMP is not set
   2.101  # CONFIG_INET_TUNNEL is not set
   2.102 +CONFIG_IP_TCPDIAG=y
   2.103 +# CONFIG_IP_TCPDIAG_IPV6 is not set
   2.104  # CONFIG_IPV6 is not set
   2.105  # CONFIG_NETFILTER is not set
   2.106  
   2.107 @@ -239,7 +257,6 @@ CONFIG_IP_PNP=y
   2.108  # CONFIG_NET_DIVERT is not set
   2.109  # CONFIG_ECONET is not set
   2.110  # CONFIG_WAN_ROUTER is not set
   2.111 -# CONFIG_NET_HW_FLOWCONTROL is not set
   2.112  
   2.113  #
   2.114  # QoS and/or fair queueing
   2.115 @@ -315,6 +332,7 @@ CONFIG_REISERFS_FS=y
   2.116  # CONFIG_MINIX_FS is not set
   2.117  # CONFIG_ROMFS_FS is not set
   2.118  # CONFIG_QUOTA is not set
   2.119 +CONFIG_DNOTIFY=y
   2.120  CONFIG_AUTOFS_FS=y
   2.121  CONFIG_AUTOFS4_FS=y
   2.122  
   2.123 @@ -347,6 +365,7 @@ CONFIG_SYSFS=y
   2.124  CONFIG_DEVPTS_FS_XATTR=y
   2.125  # CONFIG_DEVPTS_FS_SECURITY is not set
   2.126  CONFIG_TMPFS=y
   2.127 +# CONFIG_TMPFS_XATTR is not set
   2.128  # CONFIG_HUGETLBFS is not set
   2.129  # CONFIG_HUGETLB_PAGE is not set
   2.130  CONFIG_RAMFS=y
   2.131 @@ -442,6 +461,7 @@ CONFIG_NLS_ISO8859_1=y
   2.132  #
   2.133  # Security options
   2.134  #
   2.135 +# CONFIG_KEYS is not set
   2.136  # CONFIG_SECURITY is not set
   2.137  
   2.138  #
   2.139 @@ -466,6 +486,7 @@ CONFIG_CRYPTO_MD5=m
   2.140  # CONFIG_CRYPTO_TEA is not set
   2.141  # CONFIG_CRYPTO_ARC4 is not set
   2.142  # CONFIG_CRYPTO_KHAZAD is not set
   2.143 +# CONFIG_CRYPTO_ANUBIS is not set
   2.144  # CONFIG_CRYPTO_DEFLATE is not set
   2.145  # CONFIG_CRYPTO_MICHAEL_MIC is not set
   2.146  CONFIG_CRYPTO_CRC32C=m