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

Collapse All | Expand All

(-)fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c (-1 lines)
Lines 61-67 Link Here
61 
#include <linux/modversions.h>
 61 
#include <linux/modversions.h>
62 
#endif
 62 
#endif
63 
#endif
 63 
#endif
64 
#include <linux/config.h>
65 
#include <linux/module.h>
 64 
#include <linux/module.h>
66 
#include <linux/pci.h>
 65 
#include <linux/pci.h>
67 
#include <linux/init.h>
 66 
#include <linux/init.h>
(-)fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c (-3 lines)
Lines 99-107 Link Here
99 
#endif
 99 
#endif
100 
#endif
 100 
#endif
101 

          101
          

        

            

              102
              
#include <linux/config.h>

              
              
            

            

              103
              

            

            

              104
              

            

        

          105
          
#include <linux/module.h>

          102
          
#include <linux/module.h>

        

        

          106
          
#include <linux/types.h>

          103
          
#include <linux/types.h>

        

        

          107
          
#include <linux/kernel.h>

          104
          
#include <linux/kernel.h>

        



(-)fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h
      (-1 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
              
#include <linux/config.h>

              
              
            

        

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

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

        

        

          43
          
#define DRM_IOCTL_NR(n)		_IOC_NR(n)

          42
          
#define DRM_IOCTL_NR(n)		_IOC_NR(n)

        

        

          44
          
#define DRM_IOC_VOID		_IOC_NONE

          43
          
#define DRM_IOC_VOID		_IOC_NONE

        



(-)fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h
      (-1 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
              
#include <linux/config.h>

              
              
            

        

          46
          
#include <linux/module.h>

          45
          
#include <linux/module.h>

        

        

          47
          
#include <linux/kernel.h>

          46
          
#include <linux/kernel.h>

        

        

          48
          
#include <linux/miscdevice.h>

          47
          
#include <linux/miscdevice.h>

        



(-)fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c
      (-4 lines)




  

    
      
            Lines 67-75
          
      
      
        Link Here
      
    
  

        

          67
          
 * for example for CPU hot-plugging. I wonder why a desktop

          67
          
 * for example for CPU hot-plugging. I wonder why a desktop

        

        

          68
          
 * distribution would even include such a kernel patch. */

          68
          
 * distribution would even include such a kernel patch. */

        

        

          69
          
#ifdef CONFIG_MEM_MIRROR

          69
          
#ifdef CONFIG_MEM_MIRROR

        

            

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

              
              
            

            

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

            

            

              72
              
#include <linux/config.h>

            

        

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

          70
          
#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."

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

        

        

          75
          
#undef CONFIG_MEM_MIRROR

          72
          
#undef CONFIG_MEM_MIRROR

        

  

    
      
            Lines 86-92
          
      
      
        Link Here
      
    
  

        

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

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

        

        

          87
          
#include <linux/module.h>

          84
          
#include <linux/module.h>

        

        

          88
          

          85
          

        

            

              89
              
#include <linux/config.h>

              
              
            

        

          90
          
#include <linux/kernel.h>

          86
          
#include <linux/kernel.h>

        

        

          91
          
#include <linux/fs.h>

          87
          
#include <linux/fs.h>

        

        

          92
          
#include <linux/proc_fs.h>

          88
          
#include <linux/proc_fs.h>

        






  

  Return to bug 161324