diff options
author | James Morris <jmorris@namei.org> | 2009-05-08 09:56:47 +0200 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-08 09:56:47 +0200 |
commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /include/asm-frv/percpu.h | |
parent | integrity: remove __setup auditing msgs (diff) | |
parent | NOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff) | |
download | linux-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz linux-d254117099d711f215e62427f55dfb8ebd5ad011.zip |
Merge branch 'master' into next
Diffstat (limited to 'include/asm-frv/percpu.h')
-rw-r--r-- | include/asm-frv/percpu.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-frv/percpu.h b/include/asm-frv/percpu.h deleted file mode 100644 index 2cad3f874ded..000000000000 --- a/include/asm-frv/percpu.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_PERCPU_H -#define __ASM_PERCPU_H - -#include <asm-generic/percpu.h> - -#endif /* __ASM_PERCPU_H */ |