diff --git a/[refs] b/[refs] index 7fd47703751e..eb35f6cc0e33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0edce197db00094d04c7fb147903add814c9db67 +refs/heads/master: bc0f3b8ebba611291fdaa2864dbffd2d29336c64 diff --git a/trunk/include/linux/audit.h b/trunk/include/linux/audit.h index b74c148f14e3..e65399bf2710 100644 --- a/trunk/include/linux/audit.h +++ b/trunk/include/linux/audit.h @@ -384,7 +384,6 @@ extern int audit_receive_filter(int type, int pid, int uid, int seq, #define audit_log_hex(a,b,l) do { ; } while (0) #define audit_log_untrustedstring(a,s) do { ; } while (0) #define audit_log_d_path(b,p,d,v) do { ; } while (0) -#define audit_panic(m) do { ; } while (0) #endif #endif #endif