diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/linux/atmarp.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/linux/atmarp.h')
| -rw-r--r-- | include/linux/atmarp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/atmarp.h b/include/linux/atmarp.h index 057300fd5..24f82338f 100644 --- a/include/linux/atmarp.h +++ b/include/linux/atmarp.h @@ -1,6 +1,6 @@ /* atmarp.h - ATM ARP protocol and kernel-demon interface definitions */ -/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */ +/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */ #ifndef _LINUX_ATMARP_H @@ -9,6 +9,7 @@ #ifdef __KERNEL__ #include <linux/types.h> #endif +#include <linux/atmapi.h> #include <linux/atmioc.h> |