diff --git a/[refs] b/[refs]
index 31d1e5b3e378..40ae1c41380c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ee1acce49d616e0e3fbff76fa1dea0c7350535d
+refs/heads/master: 0fa67f84f445e8c567f8a189f2262dd9f8334bc1
diff --git a/trunk/drivers/video/aty/atyfb_base.c b/trunk/drivers/video/aty/atyfb_base.c
index 54ebc5a808ef..ef1379d116b4 100644
--- a/trunk/drivers/video/aty/atyfb_base.c
+++ b/trunk/drivers/video/aty/atyfb_base.c
@@ -2402,12 +2402,15 @@ static int __init aty_init(struct fb_info *info, const char *name)
 			break;
 		}
 		switch (clk_type) {
+#ifdef CONFIG_ATARI
 		case CLK_ATI18818_1:
 			par->pll_ops = &aty_pll_ati18818_1;
 			break;
+#else
 		case CLK_IBMRGB514:
 			par->pll_ops = &aty_pll_ibm514;
 			break;
+#endif
 #if 0 /* dead code */
 		case CLK_STG1703:
 			par->pll_ops = &aty_pll_stg1703;