Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-03-23 14:58:28 -07:00
commit cae53b7be1
1 changed files with 0 additions and 2 deletions

View File

@ -29,8 +29,6 @@
#ifndef _LIBSPL_UNISTD_H #ifndef _LIBSPL_UNISTD_H
#define _LIBSPL_UNISTD_H #define _LIBSPL_UNISTD_H
#include <zfs_config.h>
#if !defined(HAVE_IOCTL_IN_UNISTD_H) #if !defined(HAVE_IOCTL_IN_UNISTD_H)
# if defined(HAVE_IOCTL_IN_SYS_IOCTL_H) # if defined(HAVE_IOCTL_IN_SYS_IOCTL_H)
# include <sys/ioctl.h> # include <sys/ioctl.h>