Message ID | 1260466909-28038-3-git-send-email-apw@canonical.com |
---|---|
State | Superseded |
Delegated to: | Andy Whitcroft |
Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 66800ab..70e981e 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -232,7 +232,6 @@ CONFIG_SOUND_PRIME=m CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPI=y # CONFIG_STANDALONE is not set -CONFIG_SYN_COOKIES=y CONFIG_SYS_HYPERVISOR=y CONFIG_TCG_TPM=m CONFIG_TCP_CONG_ADVANCED=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 07ed8bc..75c0d1d 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -210,7 +210,6 @@ CONFIG_SOUND=y # CONFIG_SPARSEMEM_MANUAL is not set # CONFIG_SPI is not set CONFIG_STANDALONE=y -# CONFIG_SYN_COOKIES is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_TCG_TPM is not set # CONFIG_TCP_CONG_ADVANCED is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a5ada9b..45a0f21 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3659,6 +3659,7 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_CS=m CONFIG_SYNCLINK_GT=m +CONFIG_SYN_COOKIES=y CONFIG_SYSCTL=y CONFIG_SYSCTL_SYSCALL=y CONFIG_SYSCTL_SYSCALL_CHECK=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index ffe37c9..6a5562d 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -230,7 +230,6 @@ CONFIG_SOUND_PRIME=m # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_SPI=y # CONFIG_STANDALONE is not set -CONFIG_SYN_COOKIES=y # CONFIG_SYS_HYPERVISOR is not set CONFIG_TCG_TPM=m CONFIG_TCP_CONG_ADVANCED=y diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia index ebf3ae2..b73a18a 100644 --- a/debian.master/config/lpia/config.common.lpia +++ b/debian.master/config/lpia/config.common.lpia @@ -239,7 +239,6 @@ CONFIG_SOUND_PRIME=m # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_SPI=y # CONFIG_STANDALONE is not set -CONFIG_SYN_COOKIES=y # CONFIG_SYS_HYPERVISOR is not set CONFIG_TCG_TPM=m CONFIG_TCP_CONG_ADVANCED=y
Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armel/config.common.armel | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/lpia/config.common.lpia | 1 - 5 files changed, 1 insertions(+), 4 deletions(-)