Deleted Added
full compact
i915_drv.c (153033) i915_drv.c (153579)
1/* i915_drv.c -- ATI Radeon driver -*- linux-c -*-
2 * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
3 */
4/*-
5 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
6 * All Rights Reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

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

25 * OTHER DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Gareth Hughes <gareth@valinux.com>
29 *
30 */
31
32#include <sys/cdefs.h>
1/* i915_drv.c -- ATI Radeon driver -*- linux-c -*-
2 * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
3 */
4/*-
5 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
6 * All Rights Reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

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

25 * OTHER DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Gareth Hughes <gareth@valinux.com>
29 *
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/dev/drm/i915_drv.c 153033 2005-12-03 01:23:50Z anholt $");
33__FBSDID("$FreeBSD: head/sys/dev/drm/i915_drv.c 153579 2005-12-20 22:44:36Z jhb $");
34
35#include "dev/drm/drmP.h"
36#include "dev/drm/drm.h"
37#include "dev/drm/i915_drm.h"
38#include "dev/drm/i915_drv.h"
39#include "dev/drm/drm_pciids.h"
40
41/* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */

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

93 DEVMETHOD(device_probe, i915_probe),
94 DEVMETHOD(device_attach, i915_attach),
95 DEVMETHOD(device_detach, drm_detach),
96
97 { 0, 0 }
98};
99
100static driver_t i915_driver = {
34
35#include "dev/drm/drmP.h"
36#include "dev/drm/drm.h"
37#include "dev/drm/i915_drm.h"
38#include "dev/drm/i915_drv.h"
39#include "dev/drm/drm_pciids.h"
40
41/* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */

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

93 DEVMETHOD(device_probe, i915_probe),
94 DEVMETHOD(device_attach, i915_attach),
95 DEVMETHOD(device_detach, drm_detach),
96
97 { 0, 0 }
98};
99
100static driver_t i915_driver = {
101#if __FreeBSD_version >= 700010
102 "drm",
103#else
101 "drmsub",
104 "drmsub",
105#endif
102 i915_methods,
103 sizeof(drm_device_t)
104};
105
106extern devclass_t drm_devclass;
106 i915_methods,
107 sizeof(drm_device_t)
108};
109
110extern devclass_t drm_devclass;
111#if __FreeBSD_version >= 700010
112DRIVER_MODULE(i915, vgapci, i915_driver, drm_devclass, 0, 0);
113#else
107DRIVER_MODULE(i915, agp, i915_driver, drm_devclass, 0, 0);
114DRIVER_MODULE(i915, agp, i915_driver, drm_devclass, 0, 0);
115#endif
108MODULE_DEPEND(i915, drm, 1, 1, 1);
109
110#elif defined(__NetBSD__) || defined(__OpenBSD__)
111CFDRIVER_DECL(i915, DV_TTY, NULL);
112#endif
116MODULE_DEPEND(i915, drm, 1, 1, 1);
117
118#elif defined(__NetBSD__) || defined(__OpenBSD__)
119CFDRIVER_DECL(i915, DV_TTY, NULL);
120#endif