diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-24 11:42:34 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-24 11:42:34 +0200 |
commit | 43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch) | |
tree | 7184a24f04c72987e725e50e66db530e6f618220 /arch/x86/kernel/cpu/transmeta.c | |
parent | fee4b700a4e9e446151eb5a03874ca8666323113 (diff) | |
parent | c5ae4dca11523dff15cfb1763b64a71b805976aa (diff) | |
download | linux-43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000.tar.bz2 |
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
Diffstat (limited to 'arch/x86/kernel/cpu/transmeta.c')
-rw-r--r-- | arch/x86/kernel/cpu/transmeta.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c index 28000743bbb0..aa0430d69b90 100644 --- a/arch/x86/kernel/cpu/transmeta.c +++ b/arch/x86/kernel/cpu/transmeta.c @@ -5,7 +5,7 @@ #include <asm/msr.h> #include "cpu.h" -static void __cpuinit early_init_transmeta(struct cpuinfo_x86 *c) +static void early_init_transmeta(struct cpuinfo_x86 *c) { u32 xlvl; @@ -17,7 +17,7 @@ static void __cpuinit early_init_transmeta(struct cpuinfo_x86 *c) } } -static void __cpuinit init_transmeta(struct cpuinfo_x86 *c) +static void init_transmeta(struct cpuinfo_x86 *c) { unsigned int cap_mask, uk, max, dummy; unsigned int cms_rev1, cms_rev2; @@ -98,7 +98,7 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c) #endif } -static const struct cpu_dev __cpuinitconst transmeta_cpu_dev = { +static const struct cpu_dev transmeta_cpu_dev = { .c_vendor = "Transmeta", .c_ident = { "GenuineTMx86", "TransmetaCPU" }, .c_early_init = early_init_transmeta, |