diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
| commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
| tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /drivers/isdn/i4l/isdn_x25iface.c | |
| parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/isdn/i4l/isdn_x25iface.c')
| -rw-r--r-- | drivers/isdn/i4l/isdn_x25iface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c index 8b3efc243161..efcf1f9327e5 100644 --- a/drivers/isdn/i4l/isdn_x25iface.c +++ b/drivers/isdn/i4l/isdn_x25iface.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | /* #include <linux/isdn.h> */ | 20 | /* #include <linux/isdn.h> */ |
| 21 | #include <linux/netdevice.h> | 21 | #include <linux/netdevice.h> |
| 22 | #include <linux/concap.h> | 22 | #include <linux/concap.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/wanrouter.h> | 24 | #include <linux/wanrouter.h> |
| 24 | #include <net/x25device.h> | 25 | #include <net/x25device.h> |
| 25 | #include "isdn_x25iface.h" | 26 | #include "isdn_x25iface.h" |