Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nv50_mc.c

diff --git a/drivers/gpu/drm/nouveau/nv50_mc.c b/drivers/gpu/drm/nouveau/nv50_mc.c
index f680e8e121b10d2d7c2ff511bb8fc65c4e37d895..e0a9c3faa202f71fe8d4b6e41cc8c8d0d7c685ce 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_mc.c
+++ b/drivers/gpu/drm/nouveau/nv50_mc.c
@@ -31,20 +31,7 @@
 int
 nv50_mc_init(struct drm_device *dev)
 {
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-
        nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
-
-       /* disable, and ack any pending gpio interrupts
-        * XXX doesn't technically belong here, but it'll do for the moment
-        */
-       nv_wr32(dev, 0xe050, 0x00000000);
-       nv_wr32(dev, 0xe054, 0xffffffff);
-       if (dev_priv->chipset >= 0x90) {
-               nv_wr32(dev, 0xe070, 0x00000000);
-               nv_wr32(dev, 0xe074, 0xffffffff);
-       }
-
        return 0;
 }