diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-07 08:00:07 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-07 08:00:07 +0300 |
| commit | 35dc9ec1076b79c31bf7ed538af008b7f23bb14d (patch) | |
| tree | f90affdd5dc45f47f8d5d84ea34c71e5e521e7a1 /arch/sparc/configs/sparc64_defconfig | |
| parent | 0ec7ae928a9c19c2b7b8054507d5694a2597065e (diff) | |
| parent | 07837831047fb72856d1f61a726a4094397facd8 (diff) | |
| download | linux-35dc9ec1076b79c31bf7ed538af008b7f23bb14d.tar.xz | |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/configs/sparc64_defconfig')
| -rw-r--r-- | arch/sparc/configs/sparc64_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index 04920ab8e292..3583d676a916 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_defconfig @@ -48,7 +48,6 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y -CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y |