diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
| commit | 8ccc457722ba226ea72fca6f9ba3b54535d4749e (patch) | |
| tree | e323eda3b7ed55a5398751021e8031c1cae56f9d /drivers/char/drm/drmP.h | |
| parent | 20dd026d7f5a6972dc78b4928a99620001fa547d (diff) | |
| parent | 5dce225bd9ea60e28e17076de63df0dee51b2883 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/char/drm/drmP.h')
| -rw-r--r-- | drivers/char/drm/drmP.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 6f98701dfe15..121cc85f347e 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
| @@ -1071,5 +1071,9 @@ extern void *drm_calloc(size_t nmemb, size_t size, int area); | |||
| 1071 | extern unsigned long drm_core_get_map_ofs(drm_map_t *map); | 1071 | extern unsigned long drm_core_get_map_ofs(drm_map_t *map); |
| 1072 | extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev); | 1072 | extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev); |
| 1073 | 1073 | ||
| 1074 | #ifndef pci_pretty_name | ||
| 1075 | #define pci_pretty_name(dev) "" | ||
| 1076 | #endif | ||
| 1077 | |||
| 1074 | #endif /* __KERNEL__ */ | 1078 | #endif /* __KERNEL__ */ |
| 1075 | #endif | 1079 | #endif |