Include <geom/geom_disk.h> and stop including <sys/disk.h>. The former gives us 'struct disk'.
Include <geom/geom_disk.h> and stop including <sys/disk.h>. The
former gives us 'struct disk'.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase