From d5b05c55cf0ff39835acc8b37c1773b9a33bd158 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 21 Nov 2011 21:53:58 +0100
Subject: [PATCH] --- yaml --- r: 284848 b: refs/heads/master c:
 af5761d609290375cb8bc4ee77293da2560c574a h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/video/amifb.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 87c94ec16b05..f02871dabae9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03c740a04c8da4204ec6e7c6206e1d8a4a429dbe
+refs/heads/master: af5761d609290375cb8bc4ee77293da2560c574a
diff --git a/trunk/drivers/video/amifb.c b/trunk/drivers/video/amifb.c
index 13e7a179f8d4..2bfaf1b86d46 100644
--- a/trunk/drivers/video/amifb.c
+++ b/trunk/drivers/video/amifb.c
@@ -3733,17 +3733,15 @@ static int __init amifb_probe(struct platform_device *pdev)
 	memset(dummysprite, 0, DUMMYSPRITEMEMSIZE);
 
 	/*
-	 * Enable Display DMA
+	 * Make sure the Copper has something to do
 	 */
-
-	custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
-			DMAF_BLITTER | DMAF_SPRITE;
+	ami_init_copper();
 
 	/*
-	 * Make sure the Copper has something to do
+	 * Enable Display DMA
 	 */
-
-	ami_init_copper();
+	custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
+			DMAF_BLITTER | DMAF_SPRITE;
 
 	if (request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0,
 			"fb vertb handler", &currentpar)) {