diff -u fglrx-10-9/firegl_public.c fglrx-10-9-2.6.37/firegl_public.c
--- fglrx-10-9/firegl_public.c	2010-09-26 01:31:45.000000000 +0200
+++ fglrx-10-9-2.6.37/firegl_public.c	2011-01-13 15:29:44.000000000 +0100
@@ -322,7 +322,11 @@
     return firegl_release((KCL_IO_FILE_Handle)filp);
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
+#else
 int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
+#endif
 {
     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
 }
@@ -409,7 +413,11 @@
 #endif
     open:    ip_firegl_open,
     release: ip_firegl_release,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+    unlocked_ioctl:   ip_firegl_ioctl,
+#else
     ioctl:   ip_firegl_ioctl,
+#endif
     mmap:    ip_firegl_mmap,
 
     write:   ip_firegl_write,
@@ -5096,8 +5104,12 @@
 unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex)
 {
     kasMutex_t* mutex_obj = (kasMutex_t*)hMutex;
-    init_MUTEX(&(mutex_obj->mutex));
-    return 1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
+    sema_init(&(mutex_obj->mutex),1);
+#else
+     init_MUTEX(&(mutex_obj->mutex));
+#endif
+     return 1;
 }
 
 /** \brief Acquire Mutex object