diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-08-30 12:35:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-08-30 12:35:49 +0200 |
| commit | 3fd8a8041b3775840c8f85b6338b61beb5057160 (patch) | |
| tree | 2eb4fd3eae3168ae2837c4f98188fd25f62d5939 /arch/x86/include/asm/microcode_amd.h | |
| parent | 1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff) | |
| parent | 6d52825fd4e78b251f4844f6662a3bc4e31671c7 (diff) | |
Merge tag 'asoc-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.12
A few more updates for v3.12, mostly small cleanups plus the addition of
the DT bindings for kirkwood and the new i.MX S/PDIF driver.
Diffstat (limited to 'arch/x86/include/asm/microcode_amd.h')
| -rw-r--r-- | arch/x86/include/asm/microcode_amd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h index 50e5c58ced23..4c019179a57d 100644 --- a/arch/x86/include/asm/microcode_amd.h +++ b/arch/x86/include/asm/microcode_amd.h @@ -59,7 +59,7 @@ static inline u16 find_equiv_id(struct equiv_cpu_entry *equiv_cpu_table, extern int __apply_microcode_amd(struct microcode_amd *mc_amd); extern int apply_microcode_amd(int cpu); -extern enum ucode_state load_microcode_amd(int cpu, const u8 *data, size_t size); +extern enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size); #ifdef CONFIG_MICROCODE_AMD_EARLY #ifdef CONFIG_X86_32 |