diff --git a/debian/changelog b/debian/changelog index b3f2bea9a..42c57dc91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,8 @@ linux-2.6 (2.6.24~rc7-1~experimental.1) UNRELEASED; urgency=low SCSI_SRP_TGT_ATTRS, ADM8211, MTD_INTEL_VR_NOR, MTD_ALAUDA, MTD_ONENAND_2X_PROGRAM, MTD_ONENAND_SIM, DM_MULTIPATH_HP, FUJITSU_LAPTOP, QUOTA_NETLINK_INTERFACE, DM_UEVENT, SCSI_FC_TGT_ATTRS, SSB, BT_HCIUART_LL, - BT_HCIBTSDIO, MTD_OOPS, CGROUPS, MDIO_BITBANG, HIDRAW, P54, SDIO_UART. + BT_HCIBTSDIO, MTD_OOPS, CGROUPS, MDIO_BITBANG, HIDRAW, P54, SDIO_UART, + NETCONSOLE_DYNAMIC, SECURITY_FILE_CAPABILITIES. * Disable smbfs in topconfig, not supported upstream, use cifs. * Disable bcm43xx, deprecated by upstream. Enable B43 (needs v4 firmware) and B43LEGACY (needs v3 firmware). @@ -57,7 +58,7 @@ linux-2.6 (2.6.24~rc7-1~experimental.1) UNRELEASED; urgency=low * [mips/mipsel] Remove QEMU flavour, as the Malta platform is now correctly emulated in QEMU. - -- maximilian attems Mon, 07 Jan 2008 15:27:22 +0100 + -- maximilian attems Mon, 07 Jan 2008 17:28:08 +0100 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low diff --git a/debian/config/config b/debian/config/config index 19e204e5a..f18686432 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1736,6 +1736,7 @@ CONFIG_KEYS=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITY_CAPABILITIES=y +CONFIG_SECURITY_FILE_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y