remove all dead files

svn path=/; revision=126

11 files changed, 0 insertions, 772 deletions

diff --git a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch b/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch
deleted file mode 100644
index 25d5883..0000000
--- a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- common-orig/lib/modules/fglrx/build_mod/firegl_public.c	2007-08-01 16:58:40.000000000 -0500
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-08-01 16:57:11.000000000 -0500
-@@ -144,12 +144,14 @@
- #define EXPORT_NO_SYMBOLS
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- #ifdef __x86_64__
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
- #include "linux/ioctl32.h"
- #else
- #include "asm/ioctl32.h"
- #endif
-+#endif
- 
- #ifdef __x86_64__
- #include "asm/compat.h"
diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch
deleted file mode 100644
index 9713208..0000000
--- a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 13:36:37.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 14:24:11.000000000 +0200
-@@ -2409,7 +2409,11 @@
- #ifdef pte_offset_map
-     pte_p = pte_offset_map(pmd_p, virtual_addr);
-     if (pte_present(*pte_p))
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-         ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0);
-+#else
-+    return 0;
-+#endif
-     else
-         __KE_DEBUG("page not exists!\n");
-     pte_unmap(pte_p); 
-@@ -3399,9 +3403,11 @@
-         sprintf(buf, "0x%Lx %c%c%c%c%c%c\n",
-            *phys_address,
-            pte_present (pte) ? 'p' : '-',
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-            pte_read    (pte) ? 'r' : '-',
--           pte_write   (pte) ? 'w' : '-',
-            pte_exec    (pte) ? 'x' : '-',
-+#endif
-+           pte_write   (pte) ? 'w' : '-',
-            pte_dirty   (pte) ? 'd' : '-',
-            pte_young   (pte) ? 'a' : '-');
-     }
-@@ -5348,7 +5354,11 @@
-     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
- 
-     if ((slabcache_obj->cache =
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-             kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL)))
-+#else
-+            kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL)))
-+#endif
-     {
-         ret = 1;
-     }
-
diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch
deleted file mode 100644
index 378435d..0000000
--- a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 13:36:37.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 14:24:11.000000000 +0200
-@@ -452,7 +452,7 @@
- }
- 
- static unsigned int 
--firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) 
-+firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt)
- {
-     if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt))
-     {
-@@ -1491,7 +1491,8 @@
- int ATI_API_CALL firegl_put_user_ptr(void *src, u32 *dst)
- {
-   void *temp = src;
--  return put_user(temp, dst);
-+  void *dst_temp = dst;
-+  return put_user(temp, dst_temp);
- }
- 
- int ATI_API_CALL firegl_put_user_u16(u16 src, u16 *dst)
-@@ -1883,7 +1884,7 @@
- 
- __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from)
- {
--	return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from );
-+	return (__ke_pci_dev_t*) pci_get_device(vendor, dev, (struct pci_dev *)(void *) from); 
- }
- 
- void* ATI_API_CALL __ke_malloc(__ke_size_t size)
-@@ -2813,9 +2814,9 @@
- #else
- static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */
- 
--static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs)
-+static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1)
- {
--    irq_handler_func(irq, arg1, regs);
-+    irq_handler_func(irq, arg1, NULL);
-     return IRQ_HANDLED;
- }
- 
-@@ -2826,7 +2827,7 @@
-     irq_handler_func = handler;
-     return request_irq(irq,
-         ke_irq_handler_wrap,
--        SA_SHIRQ, dev_name, dev_id);
-+        IRQF_SHARED, dev_name, dev_id);
- }
- 
- void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id)
-@@ -2848,9 +2849,7 @@
- 
- void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd)
- {
--#ifdef FIREGL_IOCTL_COMPAT
--    return 0;
--#else
-+#ifndef FIREGL_IOCTL_COMPAT
-     unregister_ioctl32_conversion(cmd);
- #endif
- }
-@@ -4353,7 +4352,7 @@
- void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) 
- {
- #ifdef CONFIG_SMP
--	smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 );
-+	smp_call_function( (void (*)(void *info)) func_to_call, NULL, 0, 1 );
- #endif
- }
- 
-@@ -5303,7 +5302,7 @@
- /** \brief Type definition of the structure describing Slab Cache object */
- typedef struct tag_kasSlabCache_t
- {
--    kmem_cache_t* cache;        /* OS slab cache object */
-+   struct  kmem_cache* cache;        /* OS slab cache object */
-     spinlock_t lock;            /* OS spinlock object protecting the cache */
-     unsigned int routine_type;  /* Type of routine the cache might be accessed from */
-     char name[14];              /* Cache object name (kernel 2.4 restricts its length to 19 chars) */
-@@ -5344,7 +5343,7 @@
- 
-     slabcache_obj->routine_type = access_type;
-     spin_lock_init(&(slabcache_obj->lock));
--    sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)slabcache_obj);
-+    sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)(long unsigned int)slabcache_obj);
- 
-     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
-
diff --git a/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23-2.patch b/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23-2.patch
deleted file mode 100644
index 5f1a34f..0000000
--- a/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23-2.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-diff -urN common/lib/modules/fglrx/build_mod/firegl_public.c~ common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c~	2007-10-22 11:30:01.000000000 -0500
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-10-24 13:31:08.000000000 -0500
-@@ -796,7 +796,7 @@
-         
-     // since privdev->pcidev is acquired in X server, use pdev 
-     // directly here to allow suspend/resume without X server start. 
--        firegl_pci_save_state(pdev, privdev);
-+        firegl_pci_save_state((__ke_pci_dev_t*)pdev, privdev);
-         pci_disable_device(pdev);
-         PMSG_EVENT(pdev->dev.power.power_state) = state;
-     }
-@@ -838,7 +838,7 @@
- 
-     // PCI config space needs to be restored very early, in particular
-     // before pci_set_master!
--    firegl_pci_restore_state(pdev, privdev);
-+    firegl_pci_restore_state((__ke_pci_dev_t*)pdev, privdev);
- 
-     if (pci_enable_device(pdev)) 
-     {
-@@ -2016,7 +2016,11 @@
- 
- __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from)
- {
--	return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from );
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
-+    return (__ke_pci_dev_t*)pci_get_device( vendor, dev, (struct pci_dev *)(void *)from );
-+#else
-+    return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from );
-+#endif
- }
- 
- void* ATI_API_CALL __ke_malloc(__ke_size_t size)
-@@ -2487,16 +2491,80 @@
- }
- 
- #ifndef ptep_clear_flush_dirty
--#define ptep_clear_flush_dirty(__vma, __address, __ptep) \
--({							 \
--    int __dirty = ptep_test_and_clear_dirty(__ptep);	 \
--    if (__dirty)					 \
--        flush_tlb_page(__vma, __address);		 \
--    __dirty;						 \
--})
-+/** \brief Test and clear the "dirty" bit in the page table entry
-+ *
-+ * \param vma Pointer to the memory region structure
-+ * \param addr Virtual address covered by vma
-+ * \param ptep Pointer to the table entry structure
-+ *
-+ * \return Old value of the "dirty" flag
-+ *
-+ */
-+static inline int ptep_clear_flush_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
-+{
-+    int ret = 0;
-+    
-+    DBG_ENTER("0x%08X, 0x%08X, 0x%08X->0x%08X", vma, addr, ptep, *ptep);
-+    
-+    if (pte_dirty(*ptep))
-+    {
-+#ifdef __x86_64__
-+        DBG_TRACE("Test and clear bit %d in 0x%08X", _PAGE_BIT_DIRTY, ptep->pte);
-+        ret = test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte);
-+#else
-+        DBG_TRACE("Test and clear bit %d in 0x%08X", _PAGE_BIT_DIRTY, ptep->pte_low);
-+        ret = test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte_low);
-+
-+        // Since we modify PTE directly, it needs to inform the hypervisor
-+        if (ret)
-+        {
-+            pte_update(vma->vm_mm, addr, ptep);
-+        }
-+#endif        
-+    }
-+
-+    DBG_TRACE("0x%08X->0x%08X", ptep, *ptep);
-+    
-+    // Flush Translation Lookaside Buffers
-+    if (ret)
-+    {
-+        flush_tlb_page(vma, addr);
-+    }
-+    
-+    DBG_LEAVE("%d", ret);
-+    
-+    return ret;
-+}
-+#endif
-+
-+#ifdef pte_offset_atomic
-+#define PTE_OFFSET_FUNC pte_offset_atomic
-+#define PTE_UNMAP_FUNC(p) pte_kunmap(p)
-+#else
-+#ifdef pte_offset_map
-+#define PTE_OFFSET_FUNC pte_offset_map
-+#define PTE_UNMAP_FUNC(p) pte_unmap(p)
-+#else
-+#ifdef pte_offset_kernel
-+#define PTE_OFFSET_FUNC pte_offset_kernel
-+#define PTE_UNMAP_FUNC(p) do {} while (0)
-+#else
-+#define PTE_OFFSET_FUNC pte_offset
-+#define PTE_UNMAP_FUNC(p) do {} while (0)
-+#endif
-+#endif
- #endif
- 
--int ATI_API_CALL __ke_vm_test_and_clear_dirty(struct mm_struct* mm, unsigned long virtual_addr)
-+/** \brief Test and clear the "dirty" bit in the page table entry referred by
-+ * the virtual address
-+ *
-+ * \param mm Pointer to the memory descriptor structure
-+ * \param virtual_addr Virtual address 
-+ *
-+ * \return Old value of the "dirty" flag on success or negative on error
-+ *
-+ */
-+int ATI_API_CALL KCL_TestAndClearPageDirtyFlag(struct mm_struct* mm, unsigned long virtual_addr)
- {
-     int ret = -1; // init with page not present
-     pgd_t* pgd_p;
-@@ -2530,37 +2598,16 @@
-     }
-     __KE_DEBUG("pmd_p=0x%08lx\n", (unsigned long)pmd_p);
- 
--#ifdef pte_offset_atomic
--    pte_p = pte_offset_atomic(pmd_p, virtual_addr);
--    if (pte_present(*pte_p))
--        ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0);
--    else
--        __KE_DEBUG("page not exists!\n");
--    pte_kunmap(pte_p);
--#else
--#ifdef pte_offset_map
--    pte_p = pte_offset_map(pmd_p, virtual_addr);
--    if (pte_present(*pte_p))
--        ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0);
--    else
--        __KE_DEBUG("page not exists!\n");
--    pte_unmap(pte_p);
--#else
--#ifdef pte_offset_kernel
--    pte_p = pte_offset_kernel(pmd_p, virtual_addr);
--    if (pte_present(*pte_p))
--        ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0);
--    else
--        __KE_DEBUG("page not exists!\n");
--#else
--    pte_p = pte_offset(pmd_p, virtual_addr);
-+    pte_p = PTE_OFFSET_FUNC(pmd_p, virtual_addr);
-     if (pte_present(*pte_p))
-+    {
-         ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0);
-+    }
-     else
-+    {
-         __KE_DEBUG("page not exists!\n");
--#endif
--#endif
--#endif
-+    }
-+    PTE_UNMAP_FUNC(pte_p);
- 
-     if (debuglevel > 2)
-     {
-@@ -2946,20 +2993,35 @@
- #else
- static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs)
- {
-     irq_handler_func(irq, arg1, regs);
-     return IRQ_HANDLED;
- }
--
--int ATI_API_CALL __ke_request_irq(unsigned int irq, 
-+#else
-+static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1)
-+{
-+    irq_handler_func(irq, arg1, (void *)0);
-+    return IRQ_HANDLED;
-+}
-+#endif
-+            
-+int ATI_API_CALL __ke_request_irq(unsigned int irq,
-     void (*ATI_API_CALL handler)(int, void *, void *),
-     const char *dev_name, void *dev_id)
- {
-     irq_handler_func = handler;
--    return request_irq(irq,
-+    return request_irq(
-+        irq,
-         ke_irq_handler_wrap,
--        SA_SHIRQ, dev_name, dev_id);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-+        SA_SHIRQ,
-+#else
-+        IRQF_SHARED,
-+#endif                
-+        dev_name,
-+        dev_id);
- }
- 
- void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id)
-@@ -3530,12 +3592,10 @@
- #else
-         *phys_address = pte_val(pte) & (u64)((u64)PAGE_MASK | (u64)0xf<<32);
- #endif
--        sprintf(buf, "0x%Lx %c%c%c%c%c%c\n",
-+        sprintf(buf, "0x%Lx %c%c%c%c\n",
-            *phys_address,
-            pte_present (pte) ? 'p' : '-',
--           pte_read    (pte) ? 'r' : '-',
-            pte_write   (pte) ? 'w' : '-',
--           pte_exec    (pte) ? 'x' : '-',
-            pte_dirty   (pte) ? 'd' : '-',
-            pte_young   (pte) ? 'a' : '-');
-     }
-@@ -5436,7 +5496,11 @@
- /** \brief Type definition of the structure describing Slab Cache object */
- typedef struct tag_kasSlabCache_t
- {
--    kmem_cache_t* cache;        /* OS slab cache object */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-+    struct kmem_cache *cache;   /* OS slab cache object */
-+#else
-+    kmem_cache_t *cache;        /* OS slab cache object */
-+#endif
-     spinlock_t lock;            /* OS spinlock object protecting the cache */
-     unsigned int routine_type;  /* Type of routine the cache might be accessed from */
-     char name[14];              /* Cache object name (kernel 2.4 restricts its length to 19 chars) */
-@@ -5482,8 +5546,12 @@
-     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
- 
-     if ((slabcache_obj->cache =
--            kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL)))
--    {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-+         kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL)))
-+#else
-+         kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL)))
-+#endif
-+{
-         ret = 1;
-     }
- 
-diff -urN common/lib/modules/fglrx/build_mod/firegl_public.h~ common/lib/modules/fglrx/build_mod/firegl_public.h
---- common/lib/modules/fglrx/build_mod/firegl_public.h~	2007-10-22 11:30:01.000000000 -0500
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h	2007-10-24 13:31:08.000000000 -0500
-@@ -241,9 +241,14 @@
- /*****************************************************************************/
- 
- typedef unsigned long __ke_dev_t;
--typedef unsigned long __ke_size_t;
- typedef unsigned long __ke_off_t;
-+#ifdef __x86_64__
- typedef long __ke_ssize_t;
-+typedef unsigned long __ke_size_t;
-+#else
-+typedef int __ke_ssize_t;
-+typedef unsigned int __ke_size_t;
-+#endif
- typedef unsigned char __ke_u8;
- typedef unsigned short __ke_u16;
- typedef unsigned int __ke_u32;
-@@ -594,7 +599,7 @@
- extern char* ATI_API_CALL __ke_strchr(const char *s, int c);
- extern int ATI_API_CALL __ke_sprintf(char* buf, const char* fmt, ...);
- extern int ATI_API_CALL __ke_snprintf(char* buf, size_t size, const char* fmt, ...);
--extern int ATI_API_CALL __ke_vm_test_and_clear_dirty(struct mm_struct* mm, unsigned long virtual_addr);
-+extern int ATI_API_CALL KCL_TestAndClearPageDirtyFlag(struct mm_struct* mm, unsigned long virtual_addr);
- extern unsigned long ATI_API_CALL __ke_do_mmap(struct file * file, unsigned long addr, unsigned long len, unsigned long pgoff);
- extern int ATI_API_CALL __ke_do_munmap(unsigned long addr, unsigned long len);
- extern void* ATI_API_CALL __ke_vmap(unsigned long *pagelist, unsigned int count);
diff --git a/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23.patch b/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23.patch
deleted file mode 100644
index 9713208..0000000
--- a/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-2.6.23.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 13:36:37.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 14:24:11.000000000 +0200
-@@ -2409,7 +2409,11 @@
- #ifdef pte_offset_map
-     pte_p = pte_offset_map(pmd_p, virtual_addr);
-     if (pte_present(*pte_p))
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-         ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0);
-+#else
-+    return 0;
-+#endif
-     else
-         __KE_DEBUG("page not exists!\n");
-     pte_unmap(pte_p); 
-@@ -3399,9 +3403,11 @@
-         sprintf(buf, "0x%Lx %c%c%c%c%c%c\n",
-            *phys_address,
-            pte_present (pte) ? 'p' : '-',
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-            pte_read    (pte) ? 'r' : '-',
--           pte_write   (pte) ? 'w' : '-',
-            pte_exec    (pte) ? 'x' : '-',
-+#endif
-+           pte_write   (pte) ? 'w' : '-',
-            pte_dirty   (pte) ? 'd' : '-',
-            pte_young   (pte) ? 'a' : '-');
-     }
-@@ -5348,7 +5354,11 @@
-     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
- 
-     if ((slabcache_obj->cache =
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-             kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL)))
-+#else
-+            kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL)))
-+#endif
-     {
-         ret = 1;
-     }
-
diff --git a/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-8.42.3-warnings.patch b/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-8.42.3-warnings.patch
deleted file mode 100644
index 378435d..0000000
--- a/x11-drivers/ati-drivers/files/8.42.3/ati-drivers-8.42.3-warnings.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 13:36:37.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 14:24:11.000000000 +0200
-@@ -452,7 +452,7 @@
- }
- 
- static unsigned int 
--firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) 
-+firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt)
- {
-     if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt))
-     {
-@@ -1491,7 +1491,8 @@
- int ATI_API_CALL firegl_put_user_ptr(void *src, u32 *dst)
- {
-   void *temp = src;
--  return put_user(temp, dst);
-+  void *dst_temp = dst;
-+  return put_user(temp, dst_temp);
- }
- 
- int ATI_API_CALL firegl_put_user_u16(u16 src, u16 *dst)
-@@ -1883,7 +1884,7 @@
- 
- __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from)
- {
--	return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from );
-+	return (__ke_pci_dev_t*) pci_get_device(vendor, dev, (struct pci_dev *)(void *) from); 
- }
- 
- void* ATI_API_CALL __ke_malloc(__ke_size_t size)
-@@ -2813,9 +2814,9 @@
- #else
- static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */
- 
--static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs)
-+static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1)
- {
--    irq_handler_func(irq, arg1, regs);
-+    irq_handler_func(irq, arg1, NULL);
-     return IRQ_HANDLED;
- }
- 
-@@ -2826,7 +2827,7 @@
-     irq_handler_func = handler;
-     return request_irq(irq,
-         ke_irq_handler_wrap,
--        SA_SHIRQ, dev_name, dev_id);
-+        IRQF_SHARED, dev_name, dev_id);
- }
- 
- void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id)
-@@ -2848,9 +2849,7 @@
- 
- void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd)
- {
--#ifdef FIREGL_IOCTL_COMPAT
--    return 0;
--#else
-+#ifndef FIREGL_IOCTL_COMPAT
-     unregister_ioctl32_conversion(cmd);
- #endif
- }
-@@ -4353,7 +4352,7 @@
- void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) 
- {
- #ifdef CONFIG_SMP
--	smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 );
-+	smp_call_function( (void (*)(void *info)) func_to_call, NULL, 0, 1 );
- #endif
- }
- 
-@@ -5303,7 +5302,7 @@
- /** \brief Type definition of the structure describing Slab Cache object */
- typedef struct tag_kasSlabCache_t
- {
--    kmem_cache_t* cache;        /* OS slab cache object */
-+   struct  kmem_cache* cache;        /* OS slab cache object */
-     spinlock_t lock;            /* OS spinlock object protecting the cache */
-     unsigned int routine_type;  /* Type of routine the cache might be accessed from */
-     char name[14];              /* Cache object name (kernel 2.4 restricts its length to 19 chars) */
-@@ -5344,7 +5343,7 @@
- 
-     slabcache_obj->routine_type = access_type;
-     spin_lock_init(&(slabcache_obj->lock));
--    sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)slabcache_obj);
-+    sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)(long unsigned int)slabcache_obj);
- 
-     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
-
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch
deleted file mode 100644
index 160565a..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c	2006-10-27 09:44:23.902749464 -0500
-@@ -61,7 +61,6 @@
- #include <linux/modversions.h>
- #endif
- #endif
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/init.h>
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c	2006-10-27 09:44:34.265174136 -0500
-@@ -99,9 +99,6 @@
- #endif
- #endif
- 
--#include <linux/config.h>
--
--
- #include <linux/module.h>
- #include <linux/types.h>
- #include <linux/kernel.h>
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h fglrx-install/common/lib/modules/fglrx/build_mod/drm.h
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/drm.h	2006-10-27 09:44:52.502401656 -0500
-@@ -38,7 +38,6 @@
- #define _DRM_H_
- 
- #if defined(__linux__)
--#include <linux/config.h>
- #include <asm/ioctl.h>		/* For _IO* macros */
- #define DRM_IOCTL_NR(n)		_IOC_NR(n)
- #define DRM_IOC_VOID		_IOC_NONE
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h	2006-10-27 09:45:03.912667032 -0500
-@@ -42,7 +42,6 @@
-  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-10-27 09:45:47.463046368 -0500
-@@ -67,9 +67,6 @@
-  * for example for CPU hot-plugging. I wonder why a desktop
-  * distribution would even include such a kernel patch. */
- #ifdef CONFIG_MEM_MIRROR
--/* Prevent linux/config.h from being included again in subsequent
-- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */
--#include <linux/config.h>
- #warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules."
- #warning "This will break page tracking when the fglrx kernel module is used."
- #undef CONFIG_MEM_MIRROR
-@@ -86,7 +83,6 @@
- #include <asm/unistd.h> /* for installing the patch wrapper */
- #include <linux/module.h>
- 
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
deleted file mode 100644
index aeaba71..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2006-12-18 10:58:15.000000000 -0500
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2006-12-18 11:14:04.000000000 -0500
-@@ -181,6 +181,70 @@
- int errno;
- #endif // __ia64__
- 
-+#if defined(__i386__)
-+#define __syscall_return(type, res) \
-+do { \
-+        if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \
-+                errno = -(res); \
-+                res = -1; \
-+        } \
-+        return (type) (res); \
-+} while (0)
-+#define _syscall2(type,name,type1,arg1,type2,arg2) \
-+type name(type1 arg1,type2 arg2) \
-+{ \
-+long __res; \
-+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-+        : "=a" (__res) \
-+        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \
-+        : "memory"); \
-+__syscall_return(type,__res); \
-+}
-+
-+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-+type name(type1 arg1,type2 arg2,type3 arg3) \
-+{ \
-+long __res; \
-+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-+        : "=a" (__res) \
-+        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
-+                  "d" ((long)(arg3)) : "memory"); \
-+__syscall_return(type,__res); \
-+}
-+#elif defined(__x86_64__)
-+#define __syscall_clobber "r11","rcx","memory" 
-+#define __syscall "syscall"
-+
-+#define __syscall_return(type, res) \
-+do { \
-+        if ((unsigned long)(res) >= (unsigned long)(-127)) { \
-+                errno = -(res); \
-+                res = -1; \
-+        } \
-+        return (type) (res); \
-+} while (0)
-+#define _syscall2(type,name,type1,arg1,type2,arg2) \
-+type name(type1 arg1,type2 arg2) \
-+{ \
-+long __res; \
-+__asm__ volatile (__syscall \
-+        : "=a" (__res) \
-+        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \
-+__syscall_return(type,__res); \
-+}
-+
-+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-+type name(type1 arg1,type2 arg2,type3 arg3) \
-+{ \
-+long __res; \
-+__asm__ volatile (__syscall \
-+        : "=a" (__res) \
-+        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \
-+                  "d" ((long)(arg3)) : __syscall_clobber); \
-+__syscall_return(type,__res); \
-+}
-+#endif
-+
- // int mlock(const void *addr, size_t len);
- _syscall2(int, mlock, const void *, addr, size_t, len )
- // int munlock(const void *addr, size_t len);
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
deleted file mode 100644
index 665d8d6..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-29 23:48:46.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-30 00:15:21.000000000 +0200
-@@ -5055,7 +5057,6 @@
-  */
- unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache)
- {
--    unsigned int ret = 0;
-     kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache;
- 
-     DBG_ENTER("0x%08X", hSlabCache);
-@@ -5069,18 +5070,11 @@
- 
-     DBG_TRACE("destroying slab object '%s'", slabcache_obj->name);
- 
--    if (kmem_cache_destroy(slabcache_obj->cache) == 0)
--    {
--        ret = 1;
--        slabcache_obj->cache = NULL;
--    }
--    else
--    {
--        DBG_ERROR("destroying failed");
--    }
-+    kmem_cache_destroy(slabcache_obj->cache);
-+    slabcache_obj->cache = NULL;
- 
--    DBG_LEAVE("%d", ret);
--    return ret;
-+    DBG_LEAVE("1");
-+    return 1;
- }
- 
- /** \brief Allocate an entry in a Slab Cache
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
deleted file mode 100644
index c830d38..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-29 23:48:46.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-30 00:15:21.000000000 +0200
-@@ -171,6 +171,8 @@
- #endif
- #endif
- 
-+#include <linux/freezer.h>
-+
- #include <linux/kmod.h>
- 
- // To enable DBG_* macros set this variable to nonzero
diff --git a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
deleted file mode 100644
index cd776e0..0000000
--- a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -17,6 +17,10 @@
-         fi
- }
- 
-+aticonfig='/opt/ati/bin/aticonfig'
-+
-+# default high power state
-+default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3`
- 
- grep -q closed /proc/acpi/button/lid/*/state
- if [ $? = 0 ]; then
-@@ -46,7 +50,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"	    
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=1 --effective=now"
- 	fi
-     done
- else
-@@ -56,7 +60,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
- 	fi
-     done
- fi