diff options
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r-- | include/drm/drmP.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0ef8e5481e15..139d859adf16 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -74,7 +74,6 @@ | |||
74 | #include <linux/idr.h> | 74 | #include <linux/idr.h> |
75 | 75 | ||
76 | #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) | 76 | #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) |
77 | #define __OS_HAS_MTRR (defined(CONFIG_MTRR)) | ||
78 | 77 | ||
79 | struct module; | 78 | struct module; |
80 | 79 | ||
@@ -139,7 +138,6 @@ int drm_err(const char *func, const char *format, ...); | |||
139 | /* driver capabilities and requirements mask */ | 138 | /* driver capabilities and requirements mask */ |
140 | #define DRIVER_USE_AGP 0x1 | 139 | #define DRIVER_USE_AGP 0x1 |
141 | #define DRIVER_REQUIRE_AGP 0x2 | 140 | #define DRIVER_REQUIRE_AGP 0x2 |
142 | #define DRIVER_USE_MTRR 0x4 | ||
143 | #define DRIVER_PCI_DMA 0x8 | 141 | #define DRIVER_PCI_DMA 0x8 |
144 | #define DRIVER_SG 0x10 | 142 | #define DRIVER_SG 0x10 |
145 | #define DRIVER_HAVE_DMA 0x20 | 143 | #define DRIVER_HAVE_DMA 0x20 |
@@ -1216,15 +1214,6 @@ static inline int drm_dev_to_irq(struct drm_device *dev) | |||
1216 | return dev->driver->bus->get_irq(dev); | 1214 | return dev->driver->bus->get_irq(dev); |
1217 | } | 1215 | } |
1218 | 1216 | ||
1219 | #if __OS_HAS_MTRR | ||
1220 | static inline int drm_core_has_MTRR(struct drm_device *dev) | ||
1221 | { | ||
1222 | return drm_core_check_feature(dev, DRIVER_USE_MTRR); | ||
1223 | } | ||
1224 | #else | ||
1225 | #define drm_core_has_MTRR(dev) (0) | ||
1226 | #endif | ||
1227 | |||
1228 | static inline void drm_device_set_unplugged(struct drm_device *dev) | 1217 | static inline void drm_device_set_unplugged(struct drm_device *dev) |
1229 | { | 1218 | { |
1230 | smp_wmb(); | 1219 | smp_wmb(); |