48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
|
|
This moves the .fops to a separate struct as required by kernel-3.3
|
|
|
|
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
|
|
|
b/drivers/gpu/drm/mach64/mach64_drv.c | 23 ++++++++++++-----------
|
|
1 file changed, 12 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/mach64/mach64_drv.c
|
|
+++ b/drivers/gpu/drm/mach64/mach64_drv.c
|
|
@@ -39,6 +39,17 @@ static struct pci_device_id pciidlist[]
|
|
mach64_PCI_IDS
|
|
};
|
|
|
|
+static const struct file_operations mach64_driver_fops = {
|
|
+ .owner = THIS_MODULE,
|
|
+ .open = drm_open,
|
|
+ .release = drm_release,
|
|
+ .unlocked_ioctl = drm_ioctl,
|
|
+ .mmap = drm_mmap,
|
|
+ .poll = drm_poll,
|
|
+ .fasync = drm_fasync,
|
|
+ .llseek = noop_llseek,
|
|
+};
|
|
+
|
|
static struct drm_driver driver = {
|
|
.driver_features =
|
|
DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_HAVE_DMA
|
|
@@ -54,17 +65,7 @@ static struct drm_driver driver = {
|
|
.reclaim_buffers = drm_core_reclaim_buffers,
|
|
.ioctls = mach64_ioctls,
|
|
.dma_ioctl = mach64_dma_buffers,
|
|
- .fops = {
|
|
- .owner = THIS_MODULE,
|
|
- .open = drm_open,
|
|
- .release = drm_release,
|
|
- .unlocked_ioctl = drm_ioctl,
|
|
- .mmap = drm_mmap,
|
|
- .poll = drm_poll,
|
|
- .fasync = drm_fasync,
|
|
- .llseek = noop_llseek,
|
|
- },
|
|
-
|
|
+ .fops = &mach64_driver_fops,
|
|
.name = DRIVER_NAME,
|
|
.desc = DRIVER_DESC,
|
|
.date = DRIVER_DATE,
|