aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_proc.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-06-07 12:12:25 -0400
committerTony Lindgren <tony@atomide.com>2013-06-07 12:12:25 -0400
commitbea6412a994a8f49d81bc103907563ab9f94c371 (patch)
tree93afcafccce0f149d4221ec4bb6156dcdafdb0e5 /drivers/scsi/scsi_proc.c
parent82c5cde1c4b01a62c9a19c9118b4b434c333ce86 (diff)
parent49006bfd31f728a0dfdef6ef41635f0e6c546155 (diff)
Merge branch 'am33xx' into omap-for-v3.11/cleanup
Diffstat (limited to 'drivers/scsi/scsi_proc.c')
-rw-r--r--drivers/scsi/scsi_proc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index db66357211ed..86f0c5d5c116 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -84,6 +84,7 @@ static int proc_scsi_host_open(struct inode *inode, struct file *file)
84 84
85static const struct file_operations proc_scsi_fops = { 85static const struct file_operations proc_scsi_fops = {
86 .open = proc_scsi_host_open, 86 .open = proc_scsi_host_open,
87 .release = single_release,
87 .read = seq_read, 88 .read = seq_read,
88 .llseek = seq_lseek, 89 .llseek = seq_lseek,
89 .write = proc_scsi_host_write 90 .write = proc_scsi_host_write