From 32f90c5d321a885876c563685c58ac653eb0ee04 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Tue, 5 Aug 2008 13:01:29 -0700
Subject: [PATCH] --- yaml --- r: 107679 b: refs/heads/master c:
 978cc90c469b38bcbbfd00a8c183d74e5b17bf45 h: refs/heads/master i:   107677:
 99fd1e17db1bb175be8a7b1e4a42e6496b99f1ca   107675:
 02f92dab6581cc53236179d8a0abbd58d20dcd0f   107671:
 f5bb43975e0ea8a868874e51886eb0424c2e39a1   107663:
 c153cf84397b2d8e0ecde34280aa5e88156b9252   107647:
 f317d16e1bfa3a2087c3650eb0c06c993e3ddff9 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/video/aty/atyfb_base.c | 29 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index dcc8590f99ac..8590e68f873e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5394ba0fd892291eb425649fdbc82b673e0b7956
+refs/heads/master: 978cc90c469b38bcbbfd00a8c183d74e5b17bf45
diff --git a/trunk/drivers/video/aty/atyfb_base.c b/trunk/drivers/video/aty/atyfb_base.c
index 620ba8120368..cc6b470073da 100644
--- a/trunk/drivers/video/aty/atyfb_base.c
+++ b/trunk/drivers/video/aty/atyfb_base.c
@@ -244,7 +244,7 @@ static int atyfb_sync(struct fb_info *info);
      */
 
 static int aty_init(struct fb_info *info);
-static void aty_resume_chip(struct fb_info *info);
+
 #ifdef CONFIG_ATARI
 static int store_video_par(char *videopar, unsigned char m64_num);
 #endif
@@ -2023,6 +2023,20 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 	return 0;
 }
 
+static void aty_resume_chip(struct fb_info *info)
+{
+	struct atyfb_par *par = info->par;
+
+	aty_st_le32(MEM_CNTL, par->mem_cntl, par);
+
+	if (par->pll_ops->resume_pll)
+		par->pll_ops->resume_pll(info, &par->pll);
+
+	if (par->aux_start)
+		aty_st_le32(BUS_CNTL,
+			aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
+}
+
 static int atyfb_pci_resume(struct pci_dev *pdev)
 {
 	struct fb_info *info = pci_get_drvdata(pdev);
@@ -2659,19 +2673,6 @@ static int __devinit aty_init(struct fb_info *info)
 	return ret;
 }
 
-static void aty_resume_chip(struct fb_info *info)
-{
-	struct atyfb_par *par = info->par;
-
-	aty_st_le32(MEM_CNTL, par->mem_cntl, par);
-
-	if (par->pll_ops->resume_pll)
-		par->pll_ops->resume_pll(info, &par->pll);
-
-	if (par->aux_start)
-		aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
-}
-
 #ifdef CONFIG_ATARI
 static int __devinit store_video_par(char *video_str, unsigned char m64_num)
 {