[STORAGE] Storage driver cleanup part 2

Move the scsiport driver into the port directory.

diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt
index 2d5c141..2353ced 100644 (file)
--- a/drivers/storage/CMakeLists.txt
+++ b/drivers/storage/CMakeLists.txt
@@ -1,8 +1,6 @@
-

 add_subdirectory(class)
 #add_subdirectory(fdc)
 add_subdirectory(floppy)
 add_subdirectory(ide)
 add_subdirectory(port)
 add_subdirectory(class)
 #add_subdirectory(fdc)
 add_subdirectory(floppy)
 add_subdirectory(ide)
 add_subdirectory(port)

-add_subdirectory(scsiport)

 add_subdirectory(storahci)
 add_subdirectory(storahci)

diff --git a/drivers/storage/port/CMakeLists.txt b/drivers/storage/port/CMakeLists.txt
index 9a5d2f2..297111c 100644 (file)
--- a/drivers/storage/port/CMakeLists.txt
+++ b/drivers/storage/port/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(buslogic)
 add_subdirectory(buslogic)

+add_subdirectory(scsiport)

 add_subdirectory(storport)
 add_subdirectory(storport)

diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/port/scsiport/CMakeLists.txt
similarity index 100%
rename from drivers/storage/scsiport/CMakeLists.txt
rename to drivers/storage/port/scsiport/CMakeLists.txt

diff --git a/drivers/storage/scsiport/precomp.h b/drivers/storage/port/scsiport/precomp.h
similarity index 100%
rename from drivers/storage/scsiport/precomp.h
rename to drivers/storage/port/scsiport/precomp.h

diff --git a/drivers/storage/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c
similarity index 100%
rename from drivers/storage/scsiport/scsiport.c
rename to drivers/storage/port/scsiport/scsiport.c

diff --git a/drivers/storage/scsiport/scsiport.rc b/drivers/storage/port/scsiport/scsiport.rc
similarity index 100%
rename from drivers/storage/scsiport/scsiport.rc
rename to drivers/storage/port/scsiport/scsiport.rc

diff --git a/drivers/storage/scsiport/scsiport.spec b/drivers/storage/port/scsiport/scsiport.spec
similarity index 100%
rename from drivers/storage/scsiport/scsiport.spec
rename to drivers/storage/port/scsiport/scsiport.spec

diff --git a/drivers/storage/scsiport/scsiport_int.h b/drivers/storage/port/scsiport/scsiport_int.h
similarity index 100%
rename from drivers/storage/scsiport/scsiport_int.h
rename to drivers/storage/port/scsiport/scsiport_int.h

diff --git a/drivers/storage/scsiport/stubs.c b/drivers/storage/port/scsiport/stubs.c
similarity index 100%
rename from drivers/storage/scsiport/stubs.c
rename to drivers/storage/port/scsiport/stubs.c