summaryrefslogtreecommitdiffstats
path: root/include/asm-um/nops.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 10:50:54 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-27 10:50:54 +0100
commit4944dd62de21230af039eda7cd218e9a09021d11 (patch)
treebac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /include/asm-um/nops.h
parentf17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
downloadblackbird-op-linux-4944dd62de21230af039eda7cd218e9a09021d11.tar.gz
blackbird-op-linux-4944dd62de21230af039eda7cd218e9a09021d11.zip
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'include/asm-um/nops.h')
-rw-r--r--include/asm-um/nops.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-um/nops.h b/include/asm-um/nops.h
deleted file mode 100644
index 814e9bf5dea6..000000000000
--- a/include/asm-um/nops.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_NOPS_H
-#define __UM_NOPS_H
-
-#include "asm/arch/nops.h"
-
-#endif
OpenPOWER on IntegriCloud