← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/i830/i830_drv.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/i830/i830_drv.c
57
57
        .device_is_agp = i830_driver_device_is_agp,
58
58
        .reclaim_buffers_locked = i830_driver_reclaim_buffers_locked,
59
59
        .dma_quiescent = i830_driver_dma_quiescent,
60
 
        .get_map_ofs = drm_core_get_map_ofs,
61
 
        .get_reg_ofs = drm_core_get_reg_ofs,
62
60
#if USE_IRQS
63
61
        .irq_preinstall = i830_driver_irq_preinstall,
64
62
        .irq_postinstall = i830_driver_irq_postinstall,
70
68
                 .owner = THIS_MODULE,
71
69
                 .open = drm_open,
72
70
                 .release = drm_release,
73
 
                 .ioctl = drm_ioctl,
 
71
                 .unlocked_ioctl = i830_ioctl,
74
72
                 .mmap = drm_mmap,
75
73
                 .poll = drm_poll,
76
74
                 .fasync = drm_fasync,
 
75
                 .llseek = noop_llseek,
77
76
        },
78
77
 
79
78
        .pci_driver = {