diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:55:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:55:23 -0700 |
| commit | 7bbedd521310547ca73cc77adcf61fb85723adc3 (patch) | |
| tree | f759d90c46bfbc48a9f396c9c6f839da11cdc6aa /drivers/char | |
| parent | f44702f49056c203341badaa2cb8a706160d9119 (diff) | |
| parent | a04ce0ffcaf561994ecf382cd3caad75556dc499 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/char')
| -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 6f98701dfe1..121cc85f347 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); extern unsigned long drm_core_get_map_ofs(drm_map_t *map); extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev); +#ifndef pci_pretty_name +#define pci_pretty_name(dev) "" +#endif + #endif /* __KERNEL__ */ #endif |