ia64/xen-unstable
changeset 9792:75f8e9c4e483
Put back some modules directly in kernel.
ATA_PIIX, PACKET and SECURITY_CAPABILITY are not correctly load on certain
distributions.
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
ATA_PIIX, PACKET and SECURITY_CAPABILITY are not correctly load on certain
distributions.
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author | vhanquez@kneesa.uk.xensource.com |
---|---|
date | Thu Apr 20 15:45:09 2006 +0100 (2006-04-20) |
parents | c76daba31026 |
children | d580da01ded7 |
files | buildconfigs/linux-defconfig_xen_x86_32 buildconfigs/linux-defconfig_xen_x86_64 |
line diff
1.1 --- a/buildconfigs/linux-defconfig_xen_x86_32 Thu Apr 20 14:10:35 2006 +0100 1.2 +++ b/buildconfigs/linux-defconfig_xen_x86_32 Thu Apr 20 15:45:09 2006 +0100 1.3 @@ -295,7 +295,7 @@ CONFIG_NET=y 1.4 # Networking options 1.5 # 1.6 # CONFIG_NETDEBUG is not set 1.7 -CONFIG_PACKET=m 1.8 +CONFIG_PACKET=y 1.9 CONFIG_PACKET_MMAP=y 1.10 CONFIG_UNIX=y 1.11 CONFIG_XFRM=y 1.12 @@ -1109,7 +1109,7 @@ CONFIG_MEGARAID_SAS=m 1.13 CONFIG_SCSI_SATA=m 1.14 CONFIG_SCSI_SATA_AHCI=m 1.15 CONFIG_SCSI_SATA_SVW=m 1.16 -CONFIG_SCSI_ATA_PIIX=m 1.17 +CONFIG_SCSI_ATA_PIIX=y 1.18 CONFIG_SCSI_SATA_MV=m 1.19 CONFIG_SCSI_SATA_NV=m 1.20 CONFIG_SCSI_PDC_ADMA=m 1.21 @@ -2967,7 +2967,7 @@ CONFIG_KEYS=y 1.22 CONFIG_SECURITY=y 1.23 CONFIG_SECURITY_NETWORK=y 1.24 # CONFIG_SECURITY_NETWORK_XFRM is not set 1.25 -CONFIG_SECURITY_CAPABILITIES=m 1.26 +CONFIG_SECURITY_CAPABILITIES=y 1.27 CONFIG_SECURITY_ROOTPLUG=m 1.28 CONFIG_SECURITY_SECLVL=m 1.29 # CONFIG_SECURITY_SELINUX is not set
2.1 --- a/buildconfigs/linux-defconfig_xen_x86_64 Thu Apr 20 14:10:35 2006 +0100 2.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64 Thu Apr 20 15:45:09 2006 +0100 2.3 @@ -244,7 +244,7 @@ CONFIG_NET=y 2.4 # Networking options 2.5 # 2.6 # CONFIG_NETDEBUG is not set 2.7 -CONFIG_PACKET=m 2.8 +CONFIG_PACKET=y 2.9 CONFIG_PACKET_MMAP=y 2.10 CONFIG_UNIX=y 2.11 CONFIG_XFRM=y 2.12 @@ -1057,7 +1057,7 @@ CONFIG_MEGARAID_SAS=m 2.13 CONFIG_SCSI_SATA=m 2.14 CONFIG_SCSI_SATA_AHCI=m 2.15 CONFIG_SCSI_SATA_SVW=m 2.16 -CONFIG_SCSI_ATA_PIIX=m 2.17 +CONFIG_SCSI_ATA_PIIX=y 2.18 CONFIG_SCSI_SATA_MV=m 2.19 CONFIG_SCSI_SATA_NV=m 2.20 CONFIG_SCSI_PDC_ADMA=m 2.21 @@ -2801,7 +2801,7 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y 2.22 CONFIG_SECURITY=y 2.23 CONFIG_SECURITY_NETWORK=y 2.24 # CONFIG_SECURITY_NETWORK_XFRM is not set 2.25 -CONFIG_SECURITY_CAPABILITIES=m 2.26 +CONFIG_SECURITY_CAPABILITIES=y 2.27 CONFIG_SECURITY_ROOTPLUG=m 2.28 CONFIG_SECURITY_SECLVL=m 2.29 # CONFIG_SECURITY_SELINUX is not set