diff --git a/[refs] b/[refs] index 796228c5c114..a72949a503b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4da47859956cebdc4c58c38a931e21847458d744 +refs/heads/master: 80bf007f20b16272f210e0803f739f5606cff59d diff --git a/trunk/include/linux/linkage.h b/trunk/include/linux/linkage.h index 3f46aedea42f..c75074cb8ad4 100644 --- a/trunk/include/linux/linkage.h +++ b/trunk/include/linux/linkage.h @@ -90,6 +90,5 @@ #define NORET_TYPE /**/ #define ATTRIB_NORET __attribute__((noreturn)) -#define NORET_AND noreturn, #endif