Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / include / video / uvesafb.h

diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
index 0993a220a3e61fb7a2b21b9cf2eeb311025e18a9..1a91850cb96142482810a28844b76dbb4122aba3 100644 (file)
--- a/include/video/uvesafb.h
+++ b/include/video/uvesafb.h
@@ -1,63 +1,8 @@
 #ifndef _UVESAFB_H
 #define _UVESAFB_H
 
-#include <linux/types.h>
-
-struct v86_regs {
-       __u32 ebx;
-       __u32 ecx;
-       __u32 edx;
-       __u32 esi;
-       __u32 edi;
-       __u32 ebp;
-       __u32 eax;
-       __u32 eip;
-       __u32 eflags;
-       __u32 esp;
-       __u16 cs;
-       __u16 ss;
-       __u16 es;
-       __u16 ds;
-       __u16 fs;
-       __u16 gs;
-};
-
-/* Task flags */
-#define TF_VBEIB       0x01
-#define TF_BUF_ESDI    0x02
-#define TF_BUF_ESBX    0x04
-#define TF_BUF_RET     0x08
-#define TF_EXIT                0x10
-
-struct uvesafb_task {
-       __u8 flags;
-       int buf_len;
-       struct v86_regs regs;
-};
-
-/* Constants for the capabilities field
- * in vbe_ib */
-#define VBE_CAP_CAN_SWITCH_DAC 0x01
-#define VBE_CAP_VGACOMPAT      0x02
-
-/* The VBE Info Block */
-struct vbe_ib {
-       char  vbe_signature[4];
-       __u16 vbe_version;
-       __u32 oem_string_ptr;
-       __u32 capabilities;
-       __u32 mode_list_ptr;
-       __u16 total_memory;
-       __u16 oem_software_rev;
-       __u32 oem_vendor_name_ptr;
-       __u32 oem_product_name_ptr;
-       __u32 oem_product_rev_ptr;
-       __u8  reserved[222];
-       char  oem_data[256];
-       char  misc_data[512];
-} __attribute__ ((packed));
+#include <uapi/video/uvesafb.h>
 
-#ifdef __KERNEL__
 
 /* VBE CRTC Info Block */
 struct vbe_crtc_ib {
@@ -191,5 +136,4 @@ struct uvesafb_par {
        struct vbe_crtc_ib crtc;
 };
 
-#endif /* __KERNEL__ */
 #endif /* _UVESAFB_H */