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

2008-12-22 13:35:14 -08:00 · 2008-12-22 13:35:14 -08:00 · f046fb3552
parent e9def5f6ab b17c1f4123
commit f046fb3552
1 changed files with 0 additions and 2 deletions
--- a/module/zfs/vdev_disk.c
+++ b/module/zfs/vdev_disk.c
@ -656,6 +656,4 @@ vdev_ops_t vdev_disk_ops = {
 	B_TRUE			/* leaf vdev */
 };

-#else
-#error "vdev_disk.c is only required for an in-kernel builds"
 #endif  /* _KERNEL */