diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 07:45:37 +0200 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 07:45:37 +0200 |
commit | 94d4ac2f4a58c6e37876827c6688c61cef21290c (patch) | |
tree | 732f4e4794f3c116041242f69754637f75c0dd57 /drivers/video/vermilion/vermilion.h | |
parent | x86: cleanup in amd_cpu_notify() (diff) | |
parent | x86: msr: fix bogus return values from rdmsr_safe/wrmsr_safe (diff) | |
download | linux-94d4ac2f4a58c6e37876827c6688c61cef21290c.tar.xz linux-94d4ac2f4a58c6e37876827c6688c61cef21290c.zip |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'drivers/video/vermilion/vermilion.h')
-rw-r--r-- | drivers/video/vermilion/vermilion.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h index c4aba59d4809..7491abfcf1fc 100644 --- a/drivers/video/vermilion/vermilion.h +++ b/drivers/video/vermilion/vermilion.h @@ -30,7 +30,6 @@ #define _VERMILION_H_ #include <linux/kernel.h> -#include <linux/version.h> #include <linux/pci.h> #include <asm/atomic.h> #include <linux/mutex.h> |