diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/drm/drm_buffer.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/drm/drm_buffer.h')
| -rw-r--r-- | include/drm/drm_buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_buffer.h b/include/drm/drm_buffer.h index 322dbff3f861..c80d3a340b94 100644 --- a/include/drm/drm_buffer.h +++ b/include/drm/drm_buffer.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #ifndef _DRM_BUFFER_H_ | 35 | #ifndef _DRM_BUFFER_H_ |
| 36 | #define _DRM_BUFFER_H_ | 36 | #define _DRM_BUFFER_H_ |
| 37 | 37 | ||
| 38 | #include "drmP.h" | 38 | #include <drm/drmP.h> |
| 39 | 39 | ||
| 40 | struct drm_buffer { | 40 | struct drm_buffer { |
| 41 | int iterator; | 41 | int iterator; |