--- ati/common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2010-11-25 20:53:35.000000000 +0100
+++ ati/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-11-26 04:48:31.804117079 +0100
@@ -279,7 +279,7 @@ const unsigned long KCL_SYSINFO_BinaryMo
 const char BUILD_KERNEL_HAS_MODVERSIONS_CLEARED;
 #endif
 
-#ifdef __SMP__
+#if CONFIG_SMP
 const unsigned long KCL_SYSINFO_SmpSupport = 1;
 const char BUILD_KERNEL_HAS_SMP_SET;
 #else
@@ -2974,7 +2974,7 @@ int ATI_API_CALL KCL_AtomicTestAndToggle
 
 /*****************************************************************************/
 
-#ifdef __SMP__
+#if CONFIG_SMP
 static atomic_t cpus_waiting;
 
 static void deferred_flush(void* contextp)
@@ -2990,7 +2990,7 @@ static void deferred_flush(void* context
 	while (atomic_read(&cpus_waiting) > 0)
 		barrier();
 }
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 
 /** \brief Run a function on all other CPUs.
  * \param func The function to run.
@@ -3006,7 +3006,7 @@ static void deferred_flush(void* context
 
 int ATI_API_CALL KCL_MEM_FlushCpuCaches(void)
 {
-#ifdef __SMP__
+#if CONFIG_SMP
     /* write back invalidate all other CPUs (exported by kernel) */
 	if (KCL_SmpCallFunction(deferred_flush, NULL, 1, 0) != 0)
 		panic("timed out waiting for the other CPUs!\n");
@@ -3022,7 +3022,7 @@ int ATI_API_CALL KCL_MEM_FlushCpuCaches(
 
 	while (atomic_read(&cpus_waiting) > 0)
 		barrier();
-#else /* !__SMP__ */
+#else /* !CONFIG_SMP */
 #if defined(__i386__) || defined(__x86_64__)
 	asm volatile ("wbinvd":::"memory");
 #elif defined(__alpha__) || defined(__sparc__)
@@ -3030,7 +3030,7 @@ int ATI_API_CALL KCL_MEM_FlushCpuCaches(
 #else
 #error "Please define flush_cache for your architecture."
 #endif
-#endif /* !__SMP__ */
+#endif /* !CONFIG_SMP */
 
     return 0;
 }