Commit 217397d7 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds

Protect <linux/console_struct.h> from multiple inclusion

Prevent <linux/console_struct.h> from being included more than once,
otherwise you get a redefinition error if you happen to include
<linux/vt_kern.h> first.
Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 00df344f
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
* to achieve effects such as fast scrolling by changing the origin. * to achieve effects such as fast scrolling by changing the origin.
*/ */
#ifndef _LINUX_CONSOLE_STRUCT_H
#define _LINUX_CONSOLE_STRUCT_H
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/vt.h> #include <linux/vt.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
...@@ -130,3 +133,5 @@ extern void vc_SAK(struct work_struct *work); ...@@ -130,3 +133,5 @@ extern void vc_SAK(struct work_struct *work);
#define CUR_DEFAULT CUR_UNDERLINE #define CUR_DEFAULT CUR_UNDERLINE
#define CON_IS_VISIBLE(conp) (*conp->vc_display_fg == conp) #define CON_IS_VISIBLE(conp) (*conp->vc_display_fg == conp)
#endif /* _LINUX_CONSOLE_STRUCT_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment