Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-03-22 16:56:32 -07:00
commit 1a6447c024
4 changed files with 0 additions and 4 deletions

View File

@ -1033,7 +1033,6 @@ done:
}
#if defined(_KERNEL) && defined(HAVE_SPL)
#include "zfs_config.h"
static int avl_init(void) { return 0; }
static int avl_fini(void) { return 0; }

View File

@ -3246,7 +3246,6 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
}
#if defined(_KERNEL) && defined(HAVE_SPL)
#include "zfs_config.h"
static int nvpair_init(void) { return 0; }
static int nvpair_fini(void) { return 0; }

View File

@ -2133,7 +2133,6 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
}
#if defined(_KERNEL) && defined(HAVE_SPL)
#include "zfs_config.h"
static int unicode_init(void) { return 0; }
static int unicode_fini(void) { return 0; }

View File

@ -534,7 +534,6 @@ zfs_prop_align_right(zfs_prop_t prop)
#endif
#if defined(_KERNEL) && defined(HAVE_SPL)
#include "zfs_config.h"
static int zcommon_init(void) { return 0; }
static int zcommon_fini(void) { return 0; }