Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

This commit is contained in:
Brian Behlendorf 2010-03-22 16:56:41 -07:00
parent 1a6447c024 039764638e
commit a608242d71
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/zfs/include/sys/blkdev.h
View File

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

1
module/zfs/include/sys/vdev_disk.h
View File

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

1
module/zfs/zfs_ioctl.c
View File

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