From 0d2007fe4f9210e8fe7692c777109824a82c99e3 Mon Sep 17 00:00:00 2001 From: njl Date: Wed, 30 Jun 2004 15:10:02 +0000 Subject: Diff reduction for style. --- sys/dev/acpica/acpi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'sys/dev/acpica') diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index b916a75..76a07e9 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -78,15 +78,14 @@ static struct cdevsw acpi_cdevsw = { .d_name = "acpi", }; -#if __FreeBSD_version >= 500000 +/* Global mutex for locking access to the ACPI subsystem. */ struct mtx acpi_mutex; -#endif /* Bitmap of device quirks. */ -int acpi_quirks; +int acpi_quirks; /* Local pools for managing system resources for ACPI child devices. */ -struct rman acpi_rman_io, acpi_rman_mem; +struct rman acpi_rman_io, acpi_rman_mem; static int acpi_modevent(struct module *mod, int event, void *junk); static void acpi_identify(driver_t *driver, device_t parent); @@ -251,10 +250,8 @@ acpi_Startup(void) return_VALUE (0); started = 1; -#if __FreeBSD_version >= 500000 /* Initialise the ACPI mutex */ mtx_init(&acpi_mutex, "ACPI global lock", NULL, MTX_DEF); -#endif /* * Set the globals from our tunables. This is needed because ACPI-CA -- cgit v1.1