diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/scsi_netlink.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/scsi_netlink.c')
| -rw-r--r-- | drivers/scsi/scsi_netlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index 723fdecd91bd..d53e6503c6d5 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/jiffies.h> | 22 | #include <linux/jiffies.h> |
| 23 | #include <linux/security.h> | 23 | #include <linux/security.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <net/sock.h> | 26 | #include <net/sock.h> |
| 26 | #include <net/netlink.h> | 27 | #include <net/netlink.h> |
| 27 | 28 | ||
| @@ -613,7 +614,7 @@ EXPORT_SYMBOL_GPL(scsi_nl_send_transport_msg); | |||
| 613 | * @data_buf: pointer to vendor unique data buffer | 614 | * @data_buf: pointer to vendor unique data buffer |
| 614 | * | 615 | * |
| 615 | * Returns: | 616 | * Returns: |
| 616 | * 0 on succesful return | 617 | * 0 on successful return |
| 617 | * otherwise, failing error code | 618 | * otherwise, failing error code |
| 618 | * | 619 | * |
| 619 | * Notes: | 620 | * Notes: |