From 164a928b77f596b6617a4bbf43a2c06bc35a5602 Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Thu, 17 Nov 2005 03:10:29 +0000
Subject: Merge from trunk.

---
 include/sys/kd.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include/sys/kd.h')

diff --git a/include/sys/kd.h b/include/sys/kd.h
index e0d2e869c..acd705723 100644
--- a/include/sys/kd.h
+++ b/include/sys/kd.h
@@ -22,8 +22,14 @@
 /* Make sure the <linux/types.h> header is not loaded.  */
 #ifndef _LINUX_TYPES_H
 # define _LINUX_TYPES_H	1
+# define __undef_LINUX_TYPES_H
 #endif
 
 #include <linux/kd.h>
 
+#ifdef __undef_LINUX_TYPES_H
+# undef _LINUX_TYPES_H
+# undef __undef_LINUX_TYPES_H
+#endif
+
 #endif	/* sys/kd.h */
-- 
cgit v1.2.3