--- common/lib/modules/fglrx/build_mod/firegl_public.c	2008-10-01 00:56:29.000000000 -0500
+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2008-10-01 00:58:05.000000000 -0500
@@ -199,6 +199,14 @@
 #define preempt_enable()
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, wait)
+#define ON_EACH_CPU(func, info, retry, wait) on_each_cpu(func, info, wait)
+#else
+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, retry, wait)
+#define ON_EACH_CPU(func, info, retry, wait) on_each_cpu(func, info, retry, wait)
+#endif
+
 // ============================================================
 /* globals */
 
@@ -2517,7 +2525,7 @@
 /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel.
   Define a simple version here.*/
 #if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
-    on_each_cpu(KCL_flush_tlb_one, &va, 1, 1);
+    ON_EACH_CPU(KCL_flush_tlb_one, &va, 1, 1);
 #else
     flush_tlb_page(vma, va);
 #endif
@@ -2924,7 +2932,7 @@
 {
 #ifdef __SMP__
     /* write back invalidate all other CPUs (exported by kernel) */
-	if (smp_call_function(deferred_flush, NULL, 1, 0) != 0)
+	if (SMP_CALL_FUNCTION(deferred_flush, NULL, 1, 0) != 0)
 		panic("timed out waiting for the other CPUs!\n");
 
     /* invalidate this CPU */
@@ -4654,7 +4662,7 @@
    }
 
 #ifdef CONFIG_SMP
-   if (smp_call_function(KCL_setup_pat, NULL, 0, 1) != 0)
+   if (SMP_CALL_FUNCTION(KCL_setup_pat, NULL, 0, 1) != 0)
        return 0;
 #endif
    KCL_setup_pat(NULL);
@@ -4673,7 +4681,7 @@
     }
 
 #ifdef CONFIG_SMP
-    if (smp_call_function(KCL_restore_pat, NULL, 0, 1) != 0)
+    if (SMP_CALL_FUNCTION(KCL_restore_pat, NULL, 0, 1) != 0)
        return;
 #endif
     KCL_restore_pat(NULL);
--- common/usr/include/GL/glATI.h	2008-09-17 15:01:07.000000000 -0500
+++ common/usr/include/GL/glATI.h	2008-10-01 01:02:49.000000000 -0500
@@ -3103,7 +3103,6 @@
 #define GL_MODULATE_SIGNED_ADD_ATIX                     0x8745
 #define GL_MODULATE_SUBTRACT_ATIX                       0x8746
 
-#define GL_ATI_texture_env_combine3
 #define GL_MODULATE_ADD_ATI                             0x8744
 #define GL_MODULATE_SIGNED_ADD_ATI                      0x8745
 #define GL_MODULATE_SUBTRACT_ATI                        0x8746