1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
|
Fix application compilation fix.
--- linux-kernel-headers/include/linux/fb.h 2003-11-04 13:26:31.000000000 +0900
+++ linux-kernel-headers/include/linux/fb.h 2003-11-04 13:24:55.000000000 +0900
@@ -2,9 +2,7 @@
#define _LINUX_FB_H
#include <linux/tty.h>
-#include <linux/workqueue.h>
#include <asm/types.h>
-#include <asm/io.h>
/* Definitions of frame buffers */
@@ -331,23 +330,12 @@
#define FB_PIXMAP_IO 4 /* memory is iomapped */
#define FB_PIXMAP_SYNC 256 /* set if GPU can DMA */
-struct fb_pixmap {
- __u8 *addr; /* pointer to memory */
- __u32 size; /* size of buffer in bytes */
- __u32 offset; /* current offset to buffer */
- __u32 buf_align; /* byte alignment of each bitmap */
- __u32 scan_align; /* alignment per scanline */
- __u32 flags; /* see FB_PIXMAP_* */
- /* access methods */
- void (*outbuf)(u8 *dst, u8 *addr, unsigned int size);
- u8 (*inbuf) (u8 *addr);
- spinlock_t lock; /* spinlock */
- atomic_t count;
-};
#ifdef __KERNEL__
#include <linux/fs.h>
#include <linux/init.h>
+#include <linux/workqueue.h>
+#include <asm/io.h>
struct fb_info;
struct vm_area_struct;
@@ -395,6 +382,20 @@
int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma);
};
+struct fb_pixmap {
+ __u8 *addr; /* pointer to memory */
+ __u32 size; /* size of buffer in bytes */
+ __u32 offset; /* current offset to buffer */
+ __u32 buf_align; /* byte alignment of each bitmap */
+ __u32 scan_align; /* alignment per scanline */
+ __u32 flags; /* see FB_PIXMAP_* */
+ /* access methods */
+ void (*outbuf)(u8 *dst, u8 *addr, unsigned int size);
+ u8 (*inbuf) (u8 *addr);
+ spinlock_t lock; /* spinlock */
+ atomic_t count;
+};
+
struct fb_info {
int node;
int flags;
--- linux-kernel-headers/include/linux/videodev.h 2003-11-04 14:04:49.000000000 +0900
+++ linux-kernel-headers/include/linux/videodev.h 2003-11-04 14:04:04.000000000 +0900
@@ -3,13 +3,13 @@
#include <linux/types.h>
#include <linux/version.h>
-#include <linux/device.h>
#define HAVE_V4L2 1
#include <linux/videodev2.h>
#ifdef __KERNEL__
+#include <linux/device.h>
#include <linux/poll.h>
#include <linux/mm.h>
|