diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /net/x25 | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/af_x25.c | 1 | ||||
| -rw-r--r-- | net/x25/x25_dev.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index a4f070023..e65c1e86f 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -46,7 +46,6 @@ #include <linux/interrupt.h> #include <linux/notifier.h> #include <linux/proc_fs.h> -#include <linux/if_arp.h> #include <linux/init.h> #include <net/x25.h> diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c index bcbf31b0d..5db6a58a5 100644 --- a/net/x25/x25_dev.c +++ b/net/x25/x25_dev.c @@ -43,7 +43,6 @@ #include <linux/interrupt.h> #include <linux/notifier.h> #include <linux/proc_fs.h> -#include <linux/if_arp.h> #include <linux/firewall.h> #include <net/x25.h> |