mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-23 05:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2015-11-13 21:29:59 -08:00
parent 9b3a353021 10a3374bc0
commit 650b196037
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scst/include/backport.h
View File

@@ -20,7 +20,8 @@
* GNU General Public License for more details.
*/
#include <linux/writeback.h> /* sync_page_range() */
#include <linux/slab.h> /* kmalloc() */
#include <linux/writeback.h> /* sync_page_range() */
/* <asm-generic/barrier.h> */

2
scstadmin/scstadmin.sysfs/Makefile
View File

@@ -20,7 +20,7 @@ uninstall:
perl-module:
@cd ./scst-$(MODULE_VERSION); \
perl Makefile.PL;
perl Makefile.PL PREFIX=$(PREFIX);
$(MAKE) -C scst-$(MODULE_VERSION)
test:

3
scstadmin/scstadmin.sysfs/scst-0.9.10/lib/SCST/SCST.pm
View File

@@ -550,7 +550,8 @@ sub drivers {
if (opendir($dHandle, $_path)) {
foreach my $driver (readdir($dHandle)) {
next if (($driver eq '.') || ($driver eq '..'));
next if ($driver eq '.' || $driver eq '..' ||
$driver eq 'copy_manager');
if (-d make_path(SCST_TARGETS_DIR(), $driver)) {
push @drivers, $driver;

2
scstadmin/scstadmin.sysfs/scstadmin
View File

@@ -1423,8 +1423,6 @@ sub writeConfiguration {
}
foreach my $driver (sort keys %{$CURRENT{'assign'}}) {
next if $driver eq 'copy_manager';
my $driver_buff;
my ($drv_attrs, $errorString) = $SCST->driverAttributes($driver);