Deleted Added
full compact
mlx_pci.c (240608) mlx_pci.c (240963)
1/*-
2 * Copyright (c) 1999 Michael Smith
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1999 Michael Smith
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/mlx/mlx_pci.c 240608 2012-09-17 15:27:30Z jhb $");
28__FBSDID("$FreeBSD: head/sys/dev/mlx/mlx_pci.c 240963 2012-09-26 14:17:14Z jhb $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bio.h>
32#include <sys/kernel.h>
33#include <sys/lock.h>
34#include <sys/module.h>
35#include <sys/mutex.h>
36#include <sys/sx.h>
37
38#include <sys/bus.h>
39#include <sys/conf.h>
40
41#include <machine/bus.h>
42#include <machine/resource.h>
43#include <sys/rman.h>
44
45#include <geom/geom_disk.h>
46
47#include <dev/pci/pcireg.h>
48#include <dev/pci/pcivar.h>
49
33#include <sys/kernel.h>
34#include <sys/lock.h>
35#include <sys/module.h>
36#include <sys/mutex.h>
37#include <sys/sx.h>
38
39#include <sys/bus.h>
40#include <sys/conf.h>
41
42#include <machine/bus.h>
43#include <machine/resource.h>
44#include <sys/rman.h>
45
46#include <geom/geom_disk.h>
47
48#include <dev/pci/pcireg.h>
49#include <dev/pci/pcivar.h>
50
50#include <dev/mlx/mlx_compat.h>
51#include <dev/mlx/mlxio.h>
52#include <dev/mlx/mlxvar.h>
53#include <dev/mlx/mlxreg.h>
54
55static int mlx_pci_probe(device_t dev);
56static int mlx_pci_attach(device_t dev);
57
58static device_method_t mlx_methods[] = {

--- 160 unchanged lines hidden ---
51#include <dev/mlx/mlxio.h>
52#include <dev/mlx/mlxvar.h>
53#include <dev/mlx/mlxreg.h>
54
55static int mlx_pci_probe(device_t dev);
56static int mlx_pci_attach(device_t dev);
57
58static device_method_t mlx_methods[] = {

--- 160 unchanged lines hidden ---