Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[sfrench/cifs-2.6.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 0c5659c41b01c502160ca089bd758a36963f7918..f0268deca658be33a9d06d81469e45e3933ed0c3 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -825,6 +825,10 @@ struct fb_tile_ops {
  */
 #define FBINFO_BE_MATH  0x100000
 
+/* report to the VT layer that this fb driver can accept forced console
+   output like oopses */
+#define FBINFO_CAN_FORCE_OUTPUT     0x200000
+
 struct fb_info {
        int node;
        int flags;