diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/char/synclink.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/char/synclink.c')
| -rw-r--r-- | drivers/char/synclink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index afded3a2379c..813552f14884 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
| @@ -81,6 +81,7 @@ | |||
| 81 | #include <linux/mm.h> | 81 | #include <linux/mm.h> |
| 82 | #include <linux/seq_file.h> | 82 | #include <linux/seq_file.h> |
| 83 | #include <linux/slab.h> | 83 | #include <linux/slab.h> |
| 84 | #include <linux/smp_lock.h> | ||
| 84 | #include <linux/delay.h> | 85 | #include <linux/delay.h> |
| 85 | #include <linux/netdevice.h> | 86 | #include <linux/netdevice.h> |
| 86 | #include <linux/vmalloc.h> | 87 | #include <linux/vmalloc.h> |