diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-10-27 10:50:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 10:50:54 +0100 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /include/asm-um/alternative.h | |
| parent | ftrace: warning in kernel/trace/ftrace.c (diff) | |
| parent | Linux 2.6.28-rc2 (diff) | |
| download | linux-dev-4944dd62de21230af039eda7cd218e9a09021d11.tar.xz linux-dev-4944dd62de21230af039eda7cd218e9a09021d11.zip | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'include/asm-um/alternative.h')
| -rw-r--r-- | include/asm-um/alternative.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-um/alternative.h b/include/asm-um/alternative.h deleted file mode 100644 index b6434396bd42..000000000000 --- a/include/asm-um/alternative.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __UM_ALTERNATIVE_H -#define __UM_ALTERNATIVE_H - -#include "asm/arch/alternative.h" - -#endif |