diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/svga.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/svga.h')
| -rw-r--r-- | include/linux/svga.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/svga.h b/include/linux/svga.h index 13ad0b82ac28..c59a51a2b0e7 100644 --- a/include/linux/svga.h +++ b/include/linux/svga.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _LINUX_SVGA_H | 1 | #ifndef _LINUX_SVGA_H |
| 2 | #define _LINUX_SVGA_H | 2 | #define _LINUX_SVGA_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 6 | #include <linux/pci.h> | 4 | #include <linux/pci.h> |
| 7 | #include <video/vga.h> | 5 | #include <video/vga.h> |
| 8 | 6 | ||
| @@ -122,6 +120,5 @@ void svga_set_timings(const struct svga_timing_regs *tm, struct fb_var_screeninf | |||
| 122 | 120 | ||
| 123 | int svga_match_format(const struct svga_fb_format *frm, struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix); | 121 | int svga_match_format(const struct svga_fb_format *frm, struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix); |
| 124 | 122 | ||
| 125 | #endif /* __KERNEL__ */ | ||
| 126 | #endif /* _LINUX_SVGA_H */ | 123 | #endif /* _LINUX_SVGA_H */ |
| 127 | 124 | ||