diff options
| author | David Woodhouse | 2008-07-15 00:49:04 +0200 |
|---|---|---|
| committer | David Woodhouse | 2008-07-15 00:51:11 +0200 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /arch | |
| parent | ftrace: document updates (diff) | |
| parent | firmware: convert sb16_csp driver to use firmware loader exclusively (diff) | |
| download | kernel-qcow2-linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.gz kernel-qcow2-linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.xz kernel-qcow2-linux-751851af7aae9b8bd5a60b3897209081fbc18b2b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/microcode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c index 9758fea87c5b..630e0be30bca 100644 --- a/arch/x86/kernel/microcode.c +++ b/arch/x86/kernel/microcode.c @@ -489,7 +489,7 @@ MODULE_ALIAS_MISCDEV(MICROCODE_MINOR); #define microcode_dev_exit() do { } while(0) #endif -static long get_next_ucode_from_buffer(void **mc, void *buf, +static long get_next_ucode_from_buffer(void **mc, const u8 *buf, unsigned long size, long offset) { microcode_header_t *mc_header; @@ -523,7 +523,7 @@ static int cpu_request_microcode(int cpu) char name[30]; struct cpuinfo_x86 *c = &cpu_data(cpu); const struct firmware *firmware; - void *buf; + const u8 *buf; unsigned long size; long offset = 0; int error; |