Fix compiling and reenable build of i915 driver.

main
Eric Anholt 2005-11-15 09:22:09 +00:00
parent 19c5c56779
commit c575b7e19e
2 changed files with 22 additions and 21 deletions

View File

@ -55,7 +55,7 @@ SHAREDFILES= drm.h \
via_verifier.h \ via_verifier.h \
via_video.c via_video.c
SUBDIR = drm mach64 mga r128 radeon savage sis tdfx # via i915 SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 # via
CLEANFILES+= ${SHAREDFILES} CLEANFILES+= ${SHAREDFILES}

View File

@ -42,29 +42,30 @@ static drm_pci_id_list_t i915_pciidlist[] = {
static void i915_configure(drm_device_t *dev) static void i915_configure(drm_device_t *dev)
{ {
dev->buf_priv_size = 1; /* No dev_priv */ dev->driver.buf_priv_size = 1; /* No dev_priv */
dev->preclose = i915_driver_preclose; dev->driver.load = i915_driver_load;
dev->lastclose = i915_driver_lastclose; dev->driver.preclose = i915_driver_preclose;
dev->device_is_agp = i915_driver_device_is_agp, dev->driver.lastclose = i915_driver_lastclose;
dev->irq_preinstall = i915_driver_irq_preinstall; dev->driver.device_is_agp = i915_driver_device_is_agp,
dev->irq_postinstall = i915_driver_irq_postinstall; dev->driver.irq_preinstall = i915_driver_irq_preinstall;
dev->irq_uninstall = i915_driver_irq_uninstall; dev->driver.irq_postinstall = i915_driver_irq_postinstall;
dev->irq_handler = i915_driver_irq_handler; dev->driver.irq_uninstall = i915_driver_irq_uninstall;
dev->driver.irq_handler = i915_driver_irq_handler;
dev->ioctls = i915_ioctls; dev->driver.ioctls = i915_ioctls;
dev->max_ioctl = i915_max_ioctl; dev->driver.max_ioctl = i915_max_ioctl;
dev->driver_name = DRIVER_NAME; dev->driver.name = DRIVER_NAME;
dev->driver_desc = DRIVER_DESC; dev->driver.desc = DRIVER_DESC;
dev->driver_date = DRIVER_DATE; dev->driver.date = DRIVER_DATE;
dev->driver_major = DRIVER_MAJOR; dev->driver.major = DRIVER_MAJOR;
dev->driver_minor = DRIVER_MINOR; dev->driver.minor = DRIVER_MINOR;
dev->driver_patchlevel = DRIVER_PATCHLEVEL; dev->driver.patchlevel = DRIVER_PATCHLEVEL;
dev->use_agp = 1; dev->driver.use_agp = 1;
dev->require_agp = 1; dev->driver.require_agp = 1;
dev->use_mtrr = 1; dev->driver.use_mtrr = 1;
dev->use_irq = 1; dev->driver.use_irq = 1;
} }
#ifdef __FreeBSD__ #ifdef __FreeBSD__