From 49b17d1c268ad338061c4c2eb960fd3a626347cb Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 8 Feb 2007 16:01:09 -0800
Subject: [PATCH] --- yaml --- r: 47009 b: refs/heads/master c:
 42c05f6e6e3d57495054a4cae35850b3f7d1c343 h: refs/heads/master i:   47007:
 32507c8fdf322ab9246ca3b6b5951d9c35c10ffe v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/atmarp.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e72e32a83433..6cb0f0463c06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6
+refs/heads/master: 42c05f6e6e3d57495054a4cae35850b3f7d1c343
diff --git a/trunk/include/linux/atmarp.h b/trunk/include/linux/atmarp.h
index ee108f9e9cb7..231f4bdec730 100644
--- a/trunk/include/linux/atmarp.h
+++ b/trunk/include/linux/atmarp.h
@@ -6,9 +6,7 @@
 #ifndef _LINUX_ATMARP_H
 #define _LINUX_ATMARP_H
 
-#ifdef __KERNEL__
 #include <linux/types.h>
-#endif
 #include <linux/atmapi.h>
 #include <linux/atmioc.h>