Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 154783 | Differences between
and this patch

Collapse All | Expand All

(-)common/lib/modules/fglrx/build_mod/drm.h.orig (+2 lines)
Lines 38-44 Link Here
38 
#define _DRM_H_
 38 
#define _DRM_H_
39 

          39
          

        

        

          40
          
#if defined(__linux__)

          40
          
#if defined(__linux__)

        

            

              
              
              41
              
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)

            

        

          41
          
#include <linux/config.h>

          42
          
#include <linux/config.h>

        

            

              
              
              43
              
#endif

            

        

          42
          
#include <asm/ioctl.h>		/* For _IO* macros */

          44
          
#include <asm/ioctl.h>		/* For _IO* macros */

        

        

          43
          
#define DRM_IOCTL_NR(n)		_IOC_NR(n)

          45
          
#define DRM_IOCTL_NR(n)		_IOC_NR(n)

        

        

          44
          
#define DRM_IOC_VOID		_IOC_NONE

          46
          
#define DRM_IOC_VOID		_IOC_NONE

        



(-)common/lib/modules/fglrx/build_mod/drmP.h.orig
      (+2 lines)




  

    
      
            Lines 42-48
          
      
      
        Link Here
      
    
  

        

          42
          
 * can build the DRM (part of PI DRI). 4/21/2000 S + B */

          42
          
 * can build the DRM (part of PI DRI). 4/21/2000 S + B */

        

        

          43
          
#include <asm/current.h>

          43
          
#include <asm/current.h>

        

        

          44
          
#endif /* __alpha__ */

          44
          
#endif /* __alpha__ */

        

            

              
              
              45
              
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)

            

        

          45
          
#include <linux/config.h>

          46
          
#include <linux/config.h>

        

            

              
              
              47
              
#endif

            

        

          46
          
#include <linux/module.h>

          48
          
#include <linux/module.h>

        

        

          47
          
#include <linux/kernel.h>

          49
          
#include <linux/kernel.h>

        

        

          48
          
#include <linux/miscdevice.h>

          50
          
#include <linux/miscdevice.h>

        



(-)common/lib/modules/fglrx/build_mod/firegl_public.c.orig
      (+4 lines)




  

    
      
            Lines 69-75
          
      
      
        Link Here
      
    
  

        

          69
          
#ifdef CONFIG_MEM_MIRROR

          69
          
#ifdef CONFIG_MEM_MIRROR

        

        

          70
          
/* Prevent linux/config.h from being included again in subsequent

          70
          
/* Prevent linux/config.h from being included again in subsequent

        

        

          71
          
 * kernel headers as that would redefine CONFIG_MEM_MIRROR. */

          71
          
 * kernel headers as that would redefine CONFIG_MEM_MIRROR. */

        

            

              
              
              72
              
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)

            

        

          72
          
#include <linux/config.h>

          73
          
#include <linux/config.h>

        

            

              
              
              74
              
#endif

            

        

          73
          
#warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules."

          75
          
#warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules."

        

        

          74
          
#warning "This will break page tracking when the fglrx kernel module is used."

          76
          
#warning "This will break page tracking when the fglrx kernel module is used."

        

        

          75
          
#undef CONFIG_MEM_MIRROR

          77
          
#undef CONFIG_MEM_MIRROR

        

  

    
      
            Lines 86-92
          
      
      
        Link Here
      
    
  

        

          86
          
#include <asm/unistd.h> /* for installing the patch wrapper */

          88
          
#include <asm/unistd.h> /* for installing the patch wrapper */

        

        

          87
          
#include <linux/module.h>

          89
          
#include <linux/module.h>

        

        

          88
          

          90
          

        

            

              
              
              91
              
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)

            

        

          89
          
#include <linux/config.h>

          92
          
#include <linux/config.h>

        

            

              
              
              93
              
#endif

            

        

          90
          
#include <linux/kernel.h>

          94
          
#include <linux/kernel.h>

        

        

          91
          
#include <linux/fs.h>

          95
          
#include <linux/fs.h>

        

        

          92
          
#include <linux/proc_fs.h>

          96
          
#include <linux/proc_fs.h>

        






  

  Return to bug 154783