diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:05:23 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:05:23 +0200 |
commit | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (patch) | |
tree | 658ebb20e4fd5dee840f27103b59da367ff473b1 /arch/alpha/include/asm/percpu.h | |
parent | Merge branch 'for-2.6.30' into for-2.6.31 (diff) | |
parent | ASoC: Remove BROKEN from mpc5200 kconfig (diff) | |
download | linux-8560b9321f9050968f393ce1ec67e47c1a0bd5cf.tar.xz linux-8560b9321f9050968f393ce1ec67e47c1a0bd5cf.zip |
Merge branch 'fix/asoc' into topic/asoc
Diffstat (limited to 'arch/alpha/include/asm/percpu.h')
-rw-r--r-- | arch/alpha/include/asm/percpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/percpu.h b/arch/alpha/include/asm/percpu.h index 3495e8e00d70..e9e0bb5a23bf 100644 --- a/arch/alpha/include/asm/percpu.h +++ b/arch/alpha/include/asm/percpu.h @@ -73,6 +73,6 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; #endif /* SMP */ -#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name) +#include <asm-generic/percpu.h> #endif /* __ALPHA_PERCPU_H */ |