From 2c842705b076fba00a9d437fdafe2fd38e6defd8 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 12 Jan 2012 17:17:14 -0800
Subject: [PATCH] --- yaml --- r: 284347 b: refs/heads/master c:
 80bf007f20b16272f210e0803f739f5606cff59d h: refs/heads/master i:   284345:
 c5f0dce0fc9d9d7b57fffad45933a36fcbb832f1   284343:
 562743986f0cd053e8d57b44d3ced2491740ad79 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/linkage.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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