diff options
| author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 22:03:52 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 22:03:52 -0400 |
| commit | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (patch) | |
| tree | d91083e3079f1ddb942a382ac2b5a7525570ad59 /net/decnet/af_decnet.c | |
| parent | dfdc58ba354adb80d67c99f7be84f95a8e02e466 (diff) | |
| parent | 1ab9dd0902df4f4ff56fbf672220549090ab28ba (diff) | |
Merge mulgrave-w:git/linux-2.6
Conflicts:
include/linux/blkdev.h
Trivial merge to incorporate tag prototypes.
Diffstat (limited to 'net/decnet/af_decnet.c')
| -rw-r--r-- | net/decnet/af_decnet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 5486247735f6..70e027375682 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
| @@ -130,6 +130,7 @@ Version 0.0.6 2.1.110 07-aug-98 Eduardo Marcelo Serrat | |||
| 130 | #include <linux/poll.h> | 130 | #include <linux/poll.h> |
| 131 | #include <net/neighbour.h> | 131 | #include <net/neighbour.h> |
| 132 | #include <net/dst.h> | 132 | #include <net/dst.h> |
| 133 | #include <net/fib_rules.h> | ||
| 133 | #include <net/dn.h> | 134 | #include <net/dn.h> |
| 134 | #include <net/dn_nsp.h> | 135 | #include <net/dn_nsp.h> |
| 135 | #include <net/dn_dev.h> | 136 | #include <net/dn_dev.h> |