diff options
| author | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
| commit | 7d45ecafb6792ca68da9517969d37d910601845f (patch) | |
| tree | a98b1074e5577e66a97963745f975404d0aac266 /drivers/char/synclink.c | |
| parent | be940d6279c30a2d7c4e8d1d5435f957f594d66d (diff) | |
| parent | 7638d5322bd89d49e013a03fe2afaeb6d214fabd (diff) | |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
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> |