diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /drivers/scsi/osd/osd_initiator.c | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'drivers/scsi/osd/osd_initiator.c')
| -rw-r--r-- | drivers/scsi/osd/osd_initiator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index 60de85091502..ee4b6914667f 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 39 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/slab.h> | ||
| 43 | |||
| 42 | #include <scsi/osd_initiator.h> | 44 | #include <scsi/osd_initiator.h> |
| 43 | #include <scsi/osd_sec.h> | 45 | #include <scsi/osd_sec.h> |
| 44 | #include <scsi/osd_attributes.h> | 46 | #include <scsi/osd_attributes.h> |