Merge branch 'topic/namespace' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...

[mirror_ubuntu-bionic-kernel.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index a964d076b4dceb93dd50e8cbc30e16bf8922824a..f4386b0ccf4010dcbfcabd8e499734fd0aa3aaed 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -400,7 +400,7 @@ struct fb_tile_ops {
 #endif /* CONFIG_FB_TILEBLITTING */
 
 /* FBINFO_* = fb_info.flags bit flags */
-#define FBINFO_MODULE          0x0001  /* Low-level driver is a module */
+#define FBINFO_DEFAULT         0
 #define FBINFO_HWACCEL_DISABLED        0x0002
        /* When FBINFO_HWACCEL_DISABLED is set:
         *  Hardware acceleration is turned off.  Software implementations
@@ -533,14 +533,6 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
        return a;
 }
 
-#ifdef MODULE
-#define FBINFO_DEFAULT FBINFO_MODULE
-#else
-#define FBINFO_DEFAULT 0
-#endif
-
-// This will go away
-#define FBINFO_FLAG_MODULE     FBINFO_MODULE
 #define FBINFO_FLAG_DEFAULT    FBINFO_DEFAULT
 
 /* This will go away