diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-06 20:42:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-06 20:42:02 -0400 |
| commit | eedc765ca4b19a41cf0b921a492ac08d640060d1 (patch) | |
| tree | 95c566c6238cc953e1e336115d2daafe8bcb388f /drivers/net/wan | |
| parent | e59d44df46edaafb6b637e98d046775524b31104 (diff) | |
| parent | 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/net_driver.h
drivers/net/sfc/siena.c
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/x25_asy.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 166e77dfffda..e47f5a986b1c 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c | |||
| @@ -37,8 +37,6 @@ | |||
| 37 | #include <net/x25device.h> | 37 | #include <net/x25device.h> |
| 38 | #include "x25_asy.h" | 38 | #include "x25_asy.h" |
| 39 | 39 | ||
| 40 | #include <net/x25device.h> | ||
| 41 | |||
| 42 | static struct net_device **x25_asy_devs; | 40 | static struct net_device **x25_asy_devs; |
| 43 | static int x25_asy_maxdev = SL_NRUNIT; | 41 | static int x25_asy_maxdev = SL_NRUNIT; |
| 44 | 42 | ||