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

This commit is contained in:
Brian Behlendorf 2009-01-06 08:44:16 -08:00
commit f943a76806
1 changed files with 2 additions and 2 deletions

View File

@ -18,8 +18,8 @@ typedef struct vdev_disk {
} vdev_disk_t; } vdev_disk_t;
extern int vdev_disk_physio(ldi_handle_t, caddr_t, size_t, uint64_t, int); extern int vdev_disk_physio(ldi_handle_t, caddr_t, size_t, uint64_t, int);
extern int vdev_disk_read_rootlabel(char *, char *, nvlist_t **);
#endif #endif /* _KERNEL */
#ifdef __cplusplus #ifdef __cplusplus
} }