diff --git a/[refs] b/[refs] index 1a6c557c1c64..34c1e4528c0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba89966c1984513f4f2cc0a6c182266be44ddd03 +refs/heads/master: 75b3f207b433dcb807fcf0f47de1c8398571ba5f diff --git a/trunk/net/dccp/Kconfig b/trunk/net/dccp/Kconfig index 3023f702eb87..187ac182e24b 100644 --- a/trunk/net/dccp/Kconfig +++ b/trunk/net/dccp/Kconfig @@ -27,7 +27,7 @@ config INET_DCCP_DIAG source "net/dccp/ccids/Kconfig" menu "DCCP Kernel Hacking" - depends on IP_DCCP=m && DEBUG_KERNEL=y + depends on IP_DCCP && DEBUG_KERNEL=y config IP_DCCP_DEBUG bool "DCCP debug messages" @@ -37,7 +37,7 @@ config IP_DCCP_DEBUG Just say N. config IP_DCCP_UNLOAD_HACK - depends on IP_DCCP_CCID3=m + depends on IP_DCCP=m && IP_DCCP_CCID3=m bool "DCCP control sock unload hack" ---help--- Enable this to be able to unload the dccp module when the it