Fri Jan 7 18:24:53 2011 UTC ()
fix compilation when _MODULE is not defined


(jmcneill)
diff -r1.28 -r1.29 src/sys/dev/pci/hdaudio/hdaudio_afg.c
cvs diff -r1.28 -r1.29 src/sys/dev/pci/hdaudio/Attic/hdaudio_afg.c (expand / switch to unified diff)

--- src/sys/dev/pci/hdaudio/Attic/hdaudio_afg.c 2011/01/07 15:30:29 1.28
+++ src/sys/dev/pci/hdaudio/Attic/hdaudio_afg.c 2011/01/07 18:24:53 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: hdaudio_afg.c,v 1.28 2011/01/07 15:30:29 jmcneill Exp $ */ 1/* $NetBSD: hdaudio_afg.c,v 1.29 2011/01/07 18:24:53 jmcneill Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk> 4 * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk>
5 * Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca> 5 * Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to The NetBSD Foundation 8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Precedence Technologies Ltd 9 * by Precedence Technologies Ltd
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -50,27 +50,27 @@ @@ -50,27 +50,27 @@
50 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 50 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
51 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 51 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
52 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 52 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 * SUCH DAMAGE. 59 * SUCH DAMAGE.
60 */ 60 */
61 61
62#include <sys/cdefs.h> 62#include <sys/cdefs.h>
63__KERNEL_RCSID(0, "$NetBSD: hdaudio_afg.c,v 1.28 2011/01/07 15:30:29 jmcneill Exp $"); 63__KERNEL_RCSID(0, "$NetBSD: hdaudio_afg.c,v 1.29 2011/01/07 18:24:53 jmcneill Exp $");
64 64
65#include <sys/types.h> 65#include <sys/types.h>
66#include <sys/param.h> 66#include <sys/param.h>
67#include <sys/systm.h> 67#include <sys/systm.h>
68#include <sys/kernel.h> 68#include <sys/kernel.h>
69#include <sys/device.h> 69#include <sys/device.h>
70#include <sys/conf.h> 70#include <sys/conf.h>
71#include <sys/bus.h> 71#include <sys/bus.h>
72#include <sys/kmem.h> 72#include <sys/kmem.h>
73#include <sys/module.h> 73#include <sys/module.h>
74 74
75#include <sys/audioio.h> 75#include <sys/audioio.h>
76#include <dev/audio_if.h> 76#include <dev/audio_if.h>
@@ -3831,27 +3831,27 @@ hdaudio_afg_dev_ioctl(void *opaque, u_lo @@ -3831,27 +3831,27 @@ hdaudio_afg_dev_ioctl(void *opaque, u_lo
3831 prop_object_release(request); 3831 prop_object_release(request);
3832 return err; 3832 return err;
3833} 3833}
3834 3834
3835MODULE(MODULE_CLASS_DRIVER, hdafg, "hdaudio"); 3835MODULE(MODULE_CLASS_DRIVER, hdafg, "hdaudio");
3836 3836
3837#ifdef _MODULE 3837#ifdef _MODULE
3838#include "ioconf.c" 3838#include "ioconf.c"
3839#endif 3839#endif
3840 3840
3841static int 3841static int
3842hdafg_modcmd(modcmd_t cmd, void *opaque) 3842hdafg_modcmd(modcmd_t cmd, void *opaque)
3843{ 3843{
3844 int error; 3844 int error = 0;
3845 3845
3846 switch (cmd) { 3846 switch (cmd) {
3847 case MODULE_CMD_INIT: 3847 case MODULE_CMD_INIT:
3848#ifdef _MODULE 3848#ifdef _MODULE
3849 error = config_init_component(cfdriver_ioconf_hdafg, 3849 error = config_init_component(cfdriver_ioconf_hdafg,
3850 cfattach_ioconf_hdafg, cfdata_ioconf_hdafg); 3850 cfattach_ioconf_hdafg, cfdata_ioconf_hdafg);
3851#endif 3851#endif
3852 return error; 3852 return error;
3853 case MODULE_CMD_FINI: 3853 case MODULE_CMD_FINI:
3854#ifdef _MODULE 3854#ifdef _MODULE
3855 error = config_fini_component(cfdriver_ioconf_hdafg, 3855 error = config_fini_component(cfdriver_ioconf_hdafg,
3856 cfattach_ioconf_hdafg, cfdata_ioconf_hdafg); 3856 cfattach_ioconf_hdafg, cfdata_ioconf_hdafg);
3857#endif 3857#endif