diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 16:51:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 16:51:57 +0200 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /include/asm-blackfin/futex.h | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'include/asm-blackfin/futex.h')
| -rw-r--r-- | include/asm-blackfin/futex.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-blackfin/futex.h b/include/asm-blackfin/futex.h deleted file mode 100644 index 6a332a9f099..00000000000 --- a/include/asm-blackfin/futex.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_FUTEX_H -#define _ASM_FUTEX_H - -#include <asm-generic/futex.h> - -#endif |