diff options
author | peter <peter@FreeBSD.org> | 1996-05-04 08:49:40 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1996-05-04 08:49:40 +0000 |
commit | 9defd27d4f1a13e54a298047ae1f0e2003dd2931 (patch) | |
tree | f7888d1e93c706b4d1d2cee336f9e1182b772e93 /sys/i386/isa/istallion.c | |
parent | c0472a5f7750b52c6f3ad5601df1d3ffb9649e28 (diff) | |
download | FreeBSD-src-9defd27d4f1a13e54a298047ae1f0e2003dd2931.zip FreeBSD-src-9defd27d4f1a13e54a298047ae1f0e2003dd2931.tar.gz |
Add $Id$
Compile for FreeBSD-2.2
Fix some compile warnings about function declarations
-current's VM include files have changed lately, this needed to be updated.
Use correct major number.
Diffstat (limited to 'sys/i386/isa/istallion.c')
-rw-r--r-- | sys/i386/isa/istallion.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c index 6fef3b8..56462a5 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -32,6 +32,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $Id$ */ /*****************************************************************************/ @@ -45,7 +47,6 @@ #include <sys/ioctl.h> #include <sys/tty.h> #include <sys/proc.h> -#include <sys/user.h> #include <sys/conf.h> #include <sys/file.h> #include <sys/uio.h> @@ -53,10 +54,13 @@ #include <sys/devconf.h> #include <machine/cpu.h> #include <machine/clock.h> +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> -#include <i386/isa/cdk.h> -#include <i386/isa/comstats.h> +#include <machine/cdk.h> +#include <machine/comstats.h> /*****************************************************************************/ @@ -65,7 +69,7 @@ * appropriate bits of code. By default this will compile for a 2.1 * level kernel. */ -#define VFREEBSD 210 +#define VFREEBSD 220 #if VFREEBSD >= 220 #define STATIC static @@ -639,7 +643,7 @@ struct isa_driver stlidriver = { * FreeBSD-2.2+ kernel linkage. */ -#define CDEV_MAJOR 72 +#define CDEV_MAJOR 75 static struct cdevsw stli_cdevsw = { stliopen, stliclose, stliread, stliwrite, @@ -666,7 +670,7 @@ SYSINIT(sidev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,stli_drvinit,NULL) /*****************************************************************************/ -static stlibrd_t *stli_brdalloc() +static stlibrd_t *stli_brdalloc(void) { stlibrd_t *brdp; @@ -688,7 +692,7 @@ static stlibrd_t *stli_brdalloc() * boards - but we only want to maintain one setup board structures. */ -static int stli_findfreeunit() +static int stli_findfreeunit(void) { int i; |