diff --git a/[refs] b/[refs] index bbc378ef9f14..b3a14af7bcf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd3ae8e61570b55e32864c5f9e50085aa67126e9 +refs/heads/master: fa7ff654e14ccacd4e758c9878ff4884f816c877 diff --git a/trunk/include/net/sctp/sctp.h b/trunk/include/net/sctp/sctp.h index 67c997cecf58..34318a33a94c 100644 --- a/trunk/include/net/sctp/sctp.h +++ b/trunk/include/net/sctp/sctp.h @@ -65,7 +65,6 @@ #ifdef TEST_FRAME -#undef CONFIG_PROC_FS #undef CONFIG_SCTP_DBG_OBJCNT #undef CONFIG_SYSCTL #endif /* TEST_FRAME */