git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
[pandora-kernel.git]
/
include
/
linux
/
matroxfb.h
diff --git
a/include/linux/matroxfb.h
b/include/linux/matroxfb.h
index
2203121
..
8c22a89
100644
(file)
--- a/
include/linux/matroxfb.h
+++ b/
include/linux/matroxfb.h
@@
-4,6
+4,7
@@
#include <asm/ioctl.h>
#include <linux/types.h>
#include <linux/videodev2.h>
#include <asm/ioctl.h>
#include <linux/types.h>
#include <linux/videodev2.h>
+#include <linux/fb.h>
struct matroxioc_output_mode {
__u32 output; /* which output */
struct matroxioc_output_mode {
__u32 output; /* which output */
@@
-37,7
+38,5
@@
enum matroxfb_ctrl_id {
MATROXFB_CID_LAST
};
MATROXFB_CID_LAST
};
-#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
-
#endif
#endif