Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module

2010-07-02 14:04:14 -07:00 · 2010-07-02 14:04:14 -07:00 · b84fd528c3
parent 65e22bdfeb 77f748fd1c
commit b84fd528c3
1 changed files with 1 additions and 1 deletions
--- a/config/kernel.m4
+++ b/config/kernel.m4
@ -285,7 +285,7 @@ dnl #
 dnl # ZFS_LINUX_CONFTEST
 dnl #
 AC_DEFUN([ZFS_LINUX_CONFTEST], [
-cat >conftest.c <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.c
 $1
 _ACEOF
 ])