12 files changed, 21 insertions, 14 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 797236befd27..d104ec95a5b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7448,7 +7448,7 @@ M:	Matthew Wilcox <willy@linux.intel.com>
 L:      linux-nvme@lists.infradead.org
 T:      git git://git.infradead.org/users/willy/linux-nvme.git
 S:      Supported
-F:      drivers/block/nvme*
+F:      drivers/nvme/host/
 F:      include/linux/nvme.h
 
 NVMEM FRAMEWORK
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 46b4a8e0f859..e69ec82ac80a 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -18,6 +18,8 @@ source "drivers/pnp/Kconfig"
 
 source "drivers/block/Kconfig"
 
+source "drivers/nvme/Kconfig"
+
 # misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
 
 source "drivers/misc/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index b250b36b54f2..42f9dd5f07c8 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -70,6 +70,7 @@ obj-$(CONFIG_NUBUS)		+= nubus/
 obj-y                           += macintosh/
 obj-$(CONFIG_IDE)               += ide/
 obj-$(CONFIG_SCSI)              += scsi/
+obj-y                           += nvme/
 obj-$(CONFIG_ATA)               += ata/
 obj-$(CONFIG_TARGET_CORE)       += target/
 obj-$(CONFIG_MTD)               += mtd/
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 1b8094d4d7af..29819e719afa 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -310,17 +310,6 @@ config BLK_DEV_NBD
 
           If unsure, say N.
 
-config BLK_DEV_NVME
-        tristate "NVM Express block device"
-        depends on PCI
-        ---help---
-          The NVM Express driver is for solid state drives directly
-          connected to the PCI or PCI Express bus.  If you know you
-          don't have one of these, it is safe to answer N.
-
-          To compile this driver as a module, choose M here: the
-          module will be called nvme.
-
 config BLK_DEV_SKD
         tristate "STEC S1120 Block Driver"
         depends on PCI
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 02b688d1438d..671329023ec2 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_XILINX_SYSACE)	+= xsysace.o
 obj-$(CONFIG_CDROM_PKTCDVD)     += pktcdvd.o
 obj-$(CONFIG_MG_DISK)           += mg_disk.o
 obj-$(CONFIG_SUNVDC)            += sunvdc.o
-obj-$(CONFIG_BLK_DEV_NVME)      += nvme.o
 obj-$(CONFIG_BLK_DEV_SKD)       += skd.o
 obj-$(CONFIG_BLK_DEV_OSD)       += osdblk.o
 
@@ -44,6 +43,5 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
 obj-$(CONFIG_BLK_DEV_NULL_BLK)  += null_blk.o
 obj-$(CONFIG_ZRAM) += zram/
 
-nvme-y          := nvme-core.o nvme-scsi.o
 skd-y           := skd_main.o
 swim_mod-y      := swim.o swim_asm.o
diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig
new file mode 100644
index 000000000000..a39d9431eaec
--- /dev/null
+++ b/drivers/nvme/Kconfig
@@ -0,0 +1 @@
+source "drivers/nvme/host/Kconfig"
diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
new file mode 100644
index 000000000000..9421e829d2a9
--- /dev/null
+++ b/drivers/nvme/Makefile
@@ -0,0 +1,2 @@
+
+obj-y           += host/
diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig
new file mode 100644
index 000000000000..0089f78b4071
--- /dev/null
+++ b/drivers/nvme/host/Kconfig
@@ -0,0 +1,10 @@
+config BLK_DEV_NVME
+        tristate "NVM Express block device"
+        depends on PCI
+        ---help---
+          The NVM Express driver is for solid state drives directly
+          connected to the PCI or PCI Express bus.  If you know you
+          don't have one of these, it is safe to answer N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called nvme.
diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile
new file mode 100644
index 000000000000..cfb6679ec245
--- /dev/null
+++ b/drivers/nvme/host/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_BLK_DEV_NVME)     += nvme.o
+
+nvme-y          += pci.o scsi.o
diff --git a/drivers/block/nvme.h b/drivers/nvme/host/nvme.h
index c1f41bf3c0f2..c1f41bf3c0f2 100644
--- a/drivers/block/nvme.h
+++ b/drivers/nvme/host/nvme.h
diff --git a/drivers/block/nvme-core.c b/drivers/nvme/host/pci.c
index a526696d684d..a526696d684d 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/nvme/host/pci.c
diff --git a/drivers/block/nvme-scsi.c b/drivers/nvme/host/scsi.c
index c3d8d3887a31..c3d8d3887a31 100644
--- a/drivers/block/nvme-scsi.c
+++ b/drivers/nvme/host/scsi.c