diff options
| author | Michel Daenzer <michel@daenzer.net> | 2004-02-28 14:29:44 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2004-02-28 14:29:44 +0000 |
| commit | f47ed991432672b7353e73b9d3194f255b957bee (patch) | |
| tree | a2cda7252867742bf5fa0eff79f6fd2dbc9240a8 | |
| parent | b61f07def349644ec8077cb12b303d444e223c1b (diff) | |
Remove extraneous code accidentally added with revision 1.86driinterface-0-0-3-20040303-premergedriinterface-0-0-3-20040303-merge
| -rw-r--r-- | linux-core/drmP.h | 17 | ||||
| -rw-r--r-- | linux/drmP.h | 17 |
2 files changed, 0 insertions, 34 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 503d6c1b..c2c14dbd 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -318,19 +318,6 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr) DRM(ioremapfree)( (map)->handle, (map)->size, (dev) ); \ } while (0) -#ifndef VMAP_4_ARGS - -#define DRM_IOREMAPAGP(map, dev) \ - (map)->handle = DRM(ioremap_agp)( (map)->offset, (map)->size, (dev) ) - -#define DRM_IOREMAPAGPFREE(map) \ - do { \ - if ( (map)->handle && (map)->size ) \ - DRM(ioremap_agp_free)( (map)->handle, (map)->size ); \ - } while (0) - -#endif - /** * Find mapping. * @@ -870,10 +857,6 @@ extern void *DRM(ioremap_nocache)(unsigned long offset, unsigned long size, extern void DRM(ioremapfree)(void *pt, unsigned long size, drm_device_t *dev); #if __REALLY_HAVE_AGP -#ifndef VMAP_4_ARGS -extern void *DRM(ioremap_agp)(unsigned long offset, unsigned long size, drm_device_t *dev); -extern void DRM(ioremap_agp_free)(void *pt, unsigned long size); -#endif extern DRM_AGP_MEM *DRM(alloc_agp)(int pages, u32 type); extern int DRM(free_agp)(DRM_AGP_MEM *handle, int pages); extern int DRM(bind_agp)(DRM_AGP_MEM *handle, unsigned int start); diff --git a/linux/drmP.h b/linux/drmP.h index 503d6c1b..c2c14dbd 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -318,19 +318,6 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr) DRM(ioremapfree)( (map)->handle, (map)->size, (dev) ); \ } while (0) -#ifndef VMAP_4_ARGS - -#define DRM_IOREMAPAGP(map, dev) \ - (map)->handle = DRM(ioremap_agp)( (map)->offset, (map)->size, (dev) ) - -#define DRM_IOREMAPAGPFREE(map) \ - do { \ - if ( (map)->handle && (map)->size ) \ - DRM(ioremap_agp_free)( (map)->handle, (map)->size ); \ - } while (0) - -#endif - /** * Find mapping. * @@ -870,10 +857,6 @@ extern void *DRM(ioremap_nocache)(unsigned long offset, unsigned long size, extern void DRM(ioremapfree)(void *pt, unsigned long size, drm_device_t *dev); #if __REALLY_HAVE_AGP -#ifndef VMAP_4_ARGS -extern void *DRM(ioremap_agp)(unsigned long offset, unsigned long size, drm_device_t *dev); -extern void DRM(ioremap_agp_free)(void *pt, unsigned long size); -#endif extern DRM_AGP_MEM *DRM(alloc_agp)(int pages, u32 type); extern int DRM(free_agp)(DRM_AGP_MEM *handle, int pages); extern int DRM(bind_agp)(DRM_AGP_MEM *handle, unsigned int start); |