diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-24 00:20:51 +0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-24 00:20:51 +0400 |
commit | 74d83b7eedab14e4b963a2220ff76f98fa6d4cb8 (patch) | |
tree | ff4b10ebd9cf1a057c4b1a703732858a539faff7 /drivers/scsi/scsi_proc.c | |
parent | 61db1802bf33bf027cd97ba3f79566b2b2fce5c6 (diff) | |
parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
download | linux-74d83b7eedab14e4b963a2220ff76f98fa6d4cb8.tar.xz |
Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/scsi/scsi_proc.c')
-rw-r--r-- | drivers/scsi/scsi_proc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c index f46855cd853d..ad747dc337da 100644 --- a/drivers/scsi/scsi_proc.c +++ b/drivers/scsi/scsi_proc.c @@ -381,11 +381,6 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf, return err; } -/** - * proc_scsi_show - show contents of /proc/scsi/scsi (attached devices) - * @s: output goes here - * @p: not used - */ static int always_match(struct device *dev, void *data) { return 1; |