diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /arch/x86 | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'arch/x86')
| -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); | |||
| 489 | #define microcode_dev_exit() do { } while(0) | 489 | #define microcode_dev_exit() do { } while(0) |
| 490 | #endif | 490 | #endif |
| 491 | 491 | ||
| 492 | static long get_next_ucode_from_buffer(void **mc, void *buf, | 492 | static long get_next_ucode_from_buffer(void **mc, const u8 *buf, |
| 493 | unsigned long size, long offset) | 493 | unsigned long size, long offset) |
| 494 | { | 494 | { |
| 495 | microcode_header_t *mc_header; | 495 | microcode_header_t *mc_header; |
| @@ -523,7 +523,7 @@ static int cpu_request_microcode(int cpu) | |||
| 523 | char name[30]; | 523 | char name[30]; |
| 524 | struct cpuinfo_x86 *c = &cpu_data(cpu); | 524 | struct cpuinfo_x86 *c = &cpu_data(cpu); |
| 525 | const struct firmware *firmware; | 525 | const struct firmware *firmware; |
| 526 | void *buf; | 526 | const u8 *buf; |
| 527 | unsigned long size; | 527 | unsigned long size; |
| 528 | long offset = 0; | 528 | long offset = 0; |
| 529 | int error; | 529 | int error; |