Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[deliverable/linux.git] / arch / x86 / kernel / microcode_core.c

diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index fa6551d36c102105c8654c7d4f60f82e65990822..1cca374a2bacc8f1f5275847ef4d4cd2787c0545 100644 (file)
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -12,7 +12,7 @@
  *     Software Developer's Manual
  *     Order Number 253668 or free download from:
  *
- *     http://developer.intel.com/design/pentium4/manuals/253668.htm
+ *     http://developer.intel.com/Assets/PDF/manual/253668.pdf 
  *
  *     For more information, go to http://www.urbanmyth.org/microcode
  *
@@ -232,6 +232,7 @@ static const struct file_operations microcode_fops = {
        .owner                  = THIS_MODULE,
        .write                  = microcode_write,
        .open                   = microcode_open,
+       .llseek         = no_llseek,
 };
 
 static struct miscdevice microcode_dev = {