diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 03:06:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 04:18:47 -0400 |
| commit | c1ab9cab75098924fa8226a8a371de66977439df (patch) | |
| tree | 767e77302ca8f2eb781c60624bc8518cd50ba6eb /drivers/message/fusion | |
| parent | ff0ff84a0767df48d728c36510365344a7e7d582 (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into tracing/core
Conflicts:
include/linux/module.h
kernel/module.c
Semantic conflict:
include/trace/events/module.h
Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up
possibly racy module refcounting")
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/message/fusion')
| -rw-r--r-- | drivers/message/fusion/mptfc.c | 1 | ||||
| -rw-r--r-- | drivers/message/fusion/mptlan.c | 1 | ||||
| -rw-r--r-- | drivers/message/fusion/mptsas.c | 1 | ||||
| -rw-r--r-- | drivers/message/fusion/mptscsih.c | 1 | ||||
| -rw-r--r-- | drivers/message/fusion/mptspi.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index 612ab3c51a6b..33f7256055b1 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | #include <linux/reboot.h> /* notifier code */ | 54 | #include <linux/reboot.h> /* notifier code */ |
| 55 | #include <linux/workqueue.h> | 55 | #include <linux/workqueue.h> |
| 56 | #include <linux/sort.h> | 56 | #include <linux/sort.h> |
| 57 | #include <linux/slab.h> | ||
| 57 | 58 | ||
| 58 | #include <scsi/scsi.h> | 59 | #include <scsi/scsi.h> |
| 59 | #include <scsi/scsi_cmnd.h> | 60 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c index 34f3f36f819b..4fa9665cbe93 100644 --- a/drivers/message/fusion/mptlan.c +++ b/drivers/message/fusion/mptlan.c | |||
| @@ -57,6 +57,7 @@ | |||
| 57 | #include <linux/module.h> | 57 | #include <linux/module.h> |
| 58 | #include <linux/fs.h> | 58 | #include <linux/fs.h> |
| 59 | #include <linux/sched.h> | 59 | #include <linux/sched.h> |
| 60 | #include <linux/slab.h> | ||
| 60 | 61 | ||
| 61 | #define my_VERSION MPT_LINUX_VERSION_COMMON | 62 | #define my_VERSION MPT_LINUX_VERSION_COMMON |
| 62 | #define MYNAM "mptlan" | 63 | #define MYNAM "mptlan" |
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index c20bbe45da82..76687126b573 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | 45 | ||
| 46 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 47 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 49 | #include <linux/errno.h> | 50 | #include <linux/errno.h> |
| 50 | #include <linux/jiffies.h> | 51 | #include <linux/jiffies.h> |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 4a7d1afcb666..6796597dcee0 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 50 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
| 51 | #include <linux/kdev_t.h> | 52 | #include <linux/kdev_t.h> |
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 69f4257419b5..e44365193fdf 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 50 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
| 51 | #include <linux/kdev_t.h> | 52 | #include <linux/kdev_t.h> |