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/atm_nicstar.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/atm_nicstar.h')
-rw-r--r-- | include/linux/atm_nicstar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/atm_nicstar.h b/include/linux/atm_nicstar.h index 3b564d227..577b79f33 100644 --- a/include/linux/atm_nicstar.h +++ b/include/linux/atm_nicstar.h @@ -18,6 +18,7 @@ * sys/types.h for struct timeval */ +#include <linux/atmapi.h> #include <linux/atmioc.h> #define NS_GETPSTAT _IOWR('a',ATMIOC_SARPRV+1,struct atmif_sioc) @@ -32,7 +33,7 @@ typedef struct buf_nr unsigned min; unsigned init; unsigned max; -} buf_nr; +}buf_nr; typedef struct pool_levels |