projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
svga.h
diff --git
a/include/linux/svga.h
b/include/linux/svga.h
index 13ad0b82ac286a37355a321928cbcd7dd5f31944..c59a51a2b0e792c39b5de96fecf228b3bfaca244 100644
(file)
--- a/
include/linux/svga.h
+++ b/
include/linux/svga.h
@@
-1,8
+1,6
@@
#ifndef _LINUX_SVGA_H
#define _LINUX_SVGA_H
#ifndef _LINUX_SVGA_H
#define _LINUX_SVGA_H
-#ifdef __KERNEL__
-
#include <linux/pci.h>
#include <video/vga.h>
#include <linux/pci.h>
#include <video/vga.h>
@@
-122,6
+120,5
@@
void svga_set_timings(const struct svga_timing_regs *tm, struct fb_var_screeninf
int svga_match_format(const struct svga_fb_format *frm, struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix);
int svga_match_format(const struct svga_fb_format *frm, struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix);
-#endif /* __KERNEL__ */
#endif /* _LINUX_SVGA_H */
#endif /* _LINUX_SVGA_H */