diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-10 00:31:56 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-10 00:31:56 +0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /include/asm-blackfin/local.h | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
| download | linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.xz | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'include/asm-blackfin/local.h')
| -rw-r--r-- | include/asm-blackfin/local.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-blackfin/local.h b/include/asm-blackfin/local.h deleted file mode 100644 index 75afffbc6421..000000000000 --- a/include/asm-blackfin/local.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __BLACKFIN_LOCAL_H -#define __BLACKFIN_LOCAL_H - -#include <asm-generic/local.h> - -#endif /* __BLACKFIN_LOCAL_H */ |