diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 18:26:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 18:26:44 -0400 |
| commit | 6bf6d1af86e7dec914f7916f2a00910650a73469 (patch) | |
| tree | 7fb14c7fce10a9f3e5c48f49941b8642562017ec /arch/m68k/include/asm/percpu.h | |
| parent | 45a690f6bcd5506d9988d0d069811ac9380750ad (diff) | |
| parent | 63f49dce39e5d6a19e5f1f9004eb48e73ba259e8 (diff) | |
Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
Diffstat (limited to 'arch/m68k/include/asm/percpu.h')
| -rw-r--r-- | arch/m68k/include/asm/percpu.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/percpu.h b/arch/m68k/include/asm/percpu.h deleted file mode 100644 index 0859d048faf5..000000000000 --- a/arch/m68k/include/asm/percpu.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __ASM_M68K_PERCPU_H | ||
| 2 | #define __ASM_M68K_PERCPU_H | ||
| 3 | |||
| 4 | #include <asm-generic/percpu.h> | ||
| 5 | |||
| 6 | #endif /* __ASM_M68K_PERCPU_H */ | ||