projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/isa' into topic/misc
[cascardo/linux.git]
/
include
/
linux
/
atmarp.h
diff --git
a/include/linux/atmarp.h
b/include/linux/atmarp.h
index
ee108f9
..
231f4bd
100644
(file)
--- a/
include/linux/atmarp.h
+++ b/
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>