Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch

module/zfs/include/sys/blkdev.h

@@ -5,7 +5,6 @@
 
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
-#include "zfs_config.h"
 
 #ifndef HAVE_FMODE_T
 typedef unsigned __bitwise__ fmode_t;

module/zfs/include/sys/vdev_disk.h

@@ -10,7 +10,6 @@ extern "C" {
 #include <sys/ddi.h>
 #include <sys/sunldi.h>
 #include <sys/sunddi.h>
-#include <zfs_config.h>
 
 typedef struct vdev_disk {
 	ddi_devid_t		vd_devid;

module/zfs/zfs_ioctl.c

@@ -69,7 +69,6 @@
 #include "zfs_namecheck.h"
 #include "zfs_prop.h"
 #include "zfs_deleg.h"
-#include "zfs_config.h"
 
 extern void zfs_init(void);
 extern void zfs_fini(void);