diff -Naur work/common/lib/modules/fglrx/build_mod/drmP.h work.new/common/lib/modules/fglrx/build_mod/drmP.h
--- work/common/lib/modules/fglrx/build_mod/drmP.h	2009-11-28 18:57:05.415720611 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/drmP.h	2009-11-28 18:56:20.687829262 +0000
@@ -42,7 +42,7 @@
  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
 #include <asm/current.h>
 #endif /* __alpha__ */
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
diff -Naur work/common/lib/modules/fglrx/build_mod/firegl_public.c work.new/common/lib/modules/fglrx/build_mod/firegl_public.c
--- work/common/lib/modules/fglrx/build_mod/firegl_public.c	2009-11-28 18:57:05.417720786 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/firegl_public.c	2009-11-28 18:58:18.046050979 +0000
@@ -28,7 +28,7 @@
 #error Kernel versions older than 2.6.0 are no longer supported by this module.
 #endif 
 
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 
 #if !defined(CONFIG_X86) 
 #if !defined(CONFIG_X86_PC) 
@@ -167,9 +167,9 @@
 #include "linux/freezer.h"
 #endif
 
-//  For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. 
+//  For 2.6.32 or higher, the UTS_RELEASE is defined in the generated/utsrelease.h. 
 #ifndef UTS_RELEASE 
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #endif
 
 #if defined(__i386__)
@@ -1441,7 +1441,9 @@
 todo !!!
 #endif
 
-unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
+void __cmpxchg_wrong_size(void) {}
+
+unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
          unsigned long new, int size)
 {
 #ifndef __HAVE_ARCH_CMPXCHG
diff -Naur work/common/lib/modules/fglrx/build_mod/firegl_public.h work.new/common/lib/modules/fglrx/build_mod/firegl_public.h
--- work/common/lib/modules/fglrx/build_mod/firegl_public.h	2009-11-28 18:57:05.419720959 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/firegl_public.h	2009-11-28 18:56:20.689829439 +0000
@@ -441,7 +441,8 @@
 extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
 extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
 
-extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
+extern void __cmpxchg_wrong_size(void);
+extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
                       unsigned long new, int size);
 
 #define __ke_cmpxchg(ptr,o,n)                        \
diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_acpi.c work.new/common/lib/modules/fglrx/build_mod/kcl_acpi.c
--- work/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2009-11-28 18:57:05.419720959 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2009-11-28 18:56:20.681828744 +0000
@@ -15,7 +15,7 @@
  ****************************************************************************/
 
 #include <linux/version.h>
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 #include <linux/acpi.h>
 
 #include "kcl_config.h"
diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_agp.c work.new/common/lib/modules/fglrx/build_mod/kcl_agp.c
--- work/common/lib/modules/fglrx/build_mod/kcl_agp.c	2009-11-28 18:57:05.420721047 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/kcl_agp.c	2009-11-28 18:56:20.682828833 +0000
@@ -31,7 +31,7 @@
  */
 
 #include <linux/version.h>
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 #include <linux/pci.h>
 #include <linux/agp_backend.h>
 #include <linux/string.h>
diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_io.c work.new/common/lib/modules/fglrx/build_mod/kcl_io.c
--- work/common/lib/modules/fglrx/build_mod/kcl_io.c	2009-11-28 18:57:05.420721047 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/kcl_io.c	2009-11-28 18:56:20.683828920 +0000
@@ -37,8 +37,9 @@
  */
 
 #include <linux/version.h>
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 #include <linux/poll.h>
+#include <linux/signal.h>
 #include <asm/io.h>
 
 #include "kcl_config.h"
diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_osconfig.h work.new/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
--- work/common/lib/modules/fglrx/build_mod/kcl_osconfig.h	2009-11-28 18:57:05.421721134 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/kcl_osconfig.h	2009-11-28 18:56:20.691829615 +0000
@@ -20,7 +20,7 @@
 #define KCL_OSCONFIG_H
 
 #include <linux/version.h>
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 
 // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
 #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_pci.c work.new/common/lib/modules/fglrx/build_mod/kcl_pci.c
--- work/common/lib/modules/fglrx/build_mod/kcl_pci.c	2009-11-28 18:57:05.421721134 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/kcl_pci.c	2009-11-28 18:56:20.683828920 +0000
@@ -31,7 +31,7 @@
  */
 
 #include <linux/version.h>
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 #include <linux/pci.h>
 
 #include "kcl_config.h"
diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_str.c work.new/common/lib/modules/fglrx/build_mod/kcl_str.c
--- work/common/lib/modules/fglrx/build_mod/kcl_str.c	2009-11-28 18:57:05.421721134 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/kcl_str.c	2009-11-28 18:56:20.684829006 +0000
@@ -30,7 +30,7 @@
  *
  */
 
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 #include <linux/string.h>
 #include <linux/module.h>
 
diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_wait.c work.new/common/lib/modules/fglrx/build_mod/kcl_wait.c
--- work/common/lib/modules/fglrx/build_mod/kcl_wait.c	2009-11-28 18:57:05.422721220 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/kcl_wait.c	2009-11-28 18:56:20.684829006 +0000
@@ -31,7 +31,7 @@
  */
 
 #include <linux/version.h>
-#include <linux/autoconf.h>
+#include <generated/autoconf.h>
 #include <linux/wait.h>
 #include <linux/highmem.h>
 #include <linux/sched.h>
diff -Naur work/common/lib/modules/fglrx/build_mod/make.sh work.new/common/lib/modules/fglrx/build_mod/make.sh
--- work/common/lib/modules/fglrx/build_mod/make.sh	2009-11-28 18:57:05.422721220 +0000
+++ work.new/common/lib/modules/fglrx/build_mod/make.sh	2009-11-28 18:56:20.671827871 +0000
@@ -218,8 +218,8 @@
         # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
         kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
     else
-        # For 2.6.18 or higher, UTS-define is defined in utsrelease.h.
-        kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
+        # For 2.6.32 or higher, UTS-define is defined in utsrelease.h.
+        kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
     fi
   fi
 fi
@@ -300,9 +300,9 @@
 fi
 
 # 3
-# linux/autoconf.h may contain this: #define CONFIG_SMP 1
+# generated/autoconf.h may contain this: #define CONFIG_SMP 1
 
-src_file=$linuxincludes/linux/autoconf.h
+src_file=$linuxincludes/generated/autoconf.h
 
 if [ ! -e $src_file ]; then
   echo "Warning:"                                                  >> $logfile
@@ -354,8 +354,8 @@
 
 MODVERSIONS=0
 
-# linux/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
-src_file=$linuxincludes/linux/autoconf.h
+# generated/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
+src_file=$linuxincludes/generated/autoconf.h
 if [ ! -e $src_file ];
 then
   echo "Warning:"                                                  >> $logfile