From b755ff5e302215e29969bcaeefd691a4cad5a2ab Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Tue, 8 May 2007 00:37:34 -0700
Subject: [PATCH] --- yaml --- r: 54879 b: refs/heads/master c:
 3a2842480bbef42c3c90e14c1f378360d8c20a0c h: refs/heads/master i:   54877:
 6a95dfa0159f3393f1b60b2786a89f81eb18000a   54875:
 b44dc297b4ed03dbf837e6e071e36337b56229fa   54871:
 edcde942a39e8078933ed5eba9ad0a72f85ffb0d   54863:
 9b97e91d1ac67efebc4b45713268b94bf28cee10   54847:
 b6d36de3b0bd76c8e335934a62c8092eeec183e5 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/aty/atyfb_base.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fcac048abf31..64fb5107d354 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41988d6e601fc6addef40421c57763a846d8ab1c
+refs/heads/master: 3a2842480bbef42c3c90e14c1f378360d8c20a0c
diff --git a/trunk/drivers/video/aty/atyfb_base.c b/trunk/drivers/video/aty/atyfb_base.c
index 8514f2a6f060..a92e02aa8d18 100644
--- a/trunk/drivers/video/aty/atyfb_base.c
+++ b/trunk/drivers/video/aty/atyfb_base.c
@@ -2338,6 +2338,7 @@ static int __devinit aty_init(struct fb_info *info)
 		case DAC_IBMRGB514:
 			par->dac_ops = &aty_dac_ibm514;
 			break;
+#ifdef CONFIG_ATARI
 		case DAC_ATI68860_B:
 		case DAC_ATI68860_C:
 			par->dac_ops = &aty_dac_ati68860b;
@@ -2346,6 +2347,7 @@ static int __devinit aty_init(struct fb_info *info)
 		case DAC_ATT21C498:
 			par->dac_ops = &aty_dac_att21c498;
 			break;
+#endif
 		default:
 			PRINTKI("aty_init: DAC type not implemented yet!\n");
 			par->dac_ops = &aty_dac_unsupported;