diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2012-01-05 15:35:42 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-07-03 12:29:29 +0300 |
| commit | 999385e1c966d30e3a69edb623986cd6bb228d9b (patch) | |
| tree | 319065588c985ed5b97912311192c017590a2c39 /include/drm | |
| parent | 68d6a684f843771b662675cc13a577518a7c1f4e (diff) | |
| download | kernel-mfld-blackbay-999385e1c966d30e3a69edb623986cd6bb228d9b.tar.gz kernel-mfld-blackbay-999385e1c966d30e3a69edb623986cd6bb228d9b.tar.bz2 kernel-mfld-blackbay-999385e1c966d30e3a69edb623986cd6bb228d9b.zip | |
Revert "drm: Protect drm/drm_os_linux.h inclusion with #ifdef"
This reverts commit "drm: Protect drm/drm_os_linux.h inclusion with #ifdef"
to minimize gfx related diff outside drivers/staging/mrst. The header file
<drm/drm_os_linux.h> is not supposed to be included directly anyway.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_os_linux.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h index 394b0f084ba..393369147a2 100644 --- a/include/drm/drm_os_linux.h +++ b/include/drm/drm_os_linux.h @@ -3,9 +3,6 @@ * OS abstraction macros. */ -#ifndef _DRM_OS_LINUX_H_ -#define _DRM_OS_LINUX_H_ - #include <linux/interrupt.h> /* For task queue support */ #include <linux/delay.h> @@ -128,5 +125,3 @@ do { \ #define DRM_WAKEUP( queue ) wake_up( queue ) #define DRM_INIT_WAITQUEUE( queue ) init_waitqueue_head( queue ) - -#endif /* _DRM_OS_LINUX_H_ */ |