Merge remote-tracking branch 'keys/keys-next'

[deliverable/linux.git] / drivers / gpu / drm / etnaviv / etnaviv_drv.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index ffd1b32caa8d5b1b3a00b1dfbdf065b375e46496..e3164d90399dcfa83c8f4cc0181b87fe3002c361 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -488,8 +488,7 @@ static const struct file_operations fops = {
 };
 
 static struct drm_driver etnaviv_drm_driver = {
-       .driver_features    = DRIVER_HAVE_IRQ |
-                               DRIVER_GEM |
+       .driver_features    = DRIVER_GEM |
                                DRIVER_PRIME |
                                DRIVER_RENDER,
        .open               = etnaviv_open,
@@ -533,8 +532,6 @@ static int etnaviv_bind(struct device *dev)
        if (!drm)
                return -ENOMEM;
 
-       drm->platformdev = to_platform_device(dev);
-
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv) {
                dev_err(dev, "failed to allocate private data\n");