diff options
| author | Kevin E Martin <kem@kem.org> | 2001-03-07 21:47:43 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2001-03-07 21:47:43 +0000 |
| commit | 5d66ea4fb42214c09449bb4a45c359440757ae5c (patch) | |
| tree | e7baf1af0f35b1e1277d2cb535390a31c7d4de20 /linux-core/drm_proc.c | |
| parent | 7e820fc7d89d06a11f448d7093469a0c765a84a6 (diff) | |
- Merge from trunk into branchsarea-1-0-0-20010307
Diffstat (limited to 'linux-core/drm_proc.c')
| -rw-r--r-- | linux-core/drm_proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c index 606286607..f65f42b71 100644 --- a/linux-core/drm_proc.c +++ b/linux-core/drm_proc.c @@ -50,7 +50,7 @@ static int DRM(bufs_info)(char *buf, char **start, off_t offset, static int DRM(vma_info)(char *buf, char **start, off_t offset, int request, int *eof, void *data); #endif -#if DRM_DMA_HISTOGRAM +#if __HAVE_DMA_HISTOGRAM static int DRM(histo_info)(char *buf, char **start, off_t offset, int request, int *eof, void *data); #endif @@ -68,7 +68,7 @@ struct drm_proc_list { #if DRM_DEBUG_CODE { "vma", DRM(vma_info) }, #endif -#if DRM_DMA_HISTOGRAM +#if __HAVE_DMA_HISTOGRAM { "histo", DRM(histo_info) }, #endif }; @@ -488,7 +488,7 @@ static int DRM(vma_info)(char *buf, char **start, off_t offset, int request, #endif -#if DRM_DMA_HISTOGRAM +#if __HAVE_DMA_HISTOGRAM static int DRM(_histo_info)(char *buf, char **start, off_t offset, int request, int *eof, void *data) { |