surround agp calls in drm_memory with __REALLY_HAVE_AGP instead of
CONFIG_... remove include for agpsupport in tdfx_drv.c - not needed.main
parent
3a74d3a371
commit
07f761bfae
|
@ -351,7 +351,7 @@ void DRM(ioremapfree)(void *pt, unsigned long size)
|
|||
}
|
||||
}
|
||||
|
||||
#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
|
||||
#if __REALLY_HAVE_AGP
|
||||
|
||||
agp_memory *DRM(alloc_agp)(int pages, u32 type)
|
||||
{
|
||||
|
@ -455,4 +455,4 @@ int DRM(unbind_agp)(agp_memory *handle)
|
|||
}
|
||||
return retcode;
|
||||
}
|
||||
#endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */
|
||||
#endif
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
#define DRIVER_PATCHLEVEL 0
|
||||
|
||||
|
||||
#include "drm_agpsupport.h"
|
||||
#include "drm_auth.h"
|
||||
#include "drm_bufs.h"
|
||||
#include "drm_context.h"
|
||||
|
|
|
@ -351,7 +351,7 @@ void DRM(ioremapfree)(void *pt, unsigned long size)
|
|||
}
|
||||
}
|
||||
|
||||
#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
|
||||
#if __REALLY_HAVE_AGP
|
||||
|
||||
agp_memory *DRM(alloc_agp)(int pages, u32 type)
|
||||
{
|
||||
|
@ -455,4 +455,4 @@ int DRM(unbind_agp)(agp_memory *handle)
|
|||
}
|
||||
return retcode;
|
||||
}
|
||||
#endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */
|
||||
#endif
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
#define DRIVER_PATCHLEVEL 0
|
||||
|
||||
|
||||
#include "drm_agpsupport.h"
|
||||
#include "drm_auth.h"
|
||||
#include "drm_bufs.h"
|
||||
#include "drm_context.h"
|
||||
|
|
Loading…
Reference in New Issue