diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-02 04:14:23 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-02 04:14:23 -0500 |
| commit | 0d6aa60b4ac9689b750e35cd66f5d7c053aff0f4 (patch) | |
| tree | dfc0d9ddfb139df8612e1823f9af89a6ff000a31 /drivers/char/drm/i915_mem.c | |
| parent | f0c408b564ddefa0959ada4e2c2248f4a57f1842 (diff) | |
drm: update to i915 1.3.0
Add support for vblank ioctls to i915 driver
From: Dave Airlie <airlied@linux.ie>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i915_mem.c')
| -rw-r--r-- | drivers/char/drm/i915_mem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c index 13176d136a99..ba87ff17ff64 100644 --- a/drivers/char/drm/i915_mem.c +++ b/drivers/char/drm/i915_mem.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* i915_mem.c -- Simple agp/fb memory manager for i915 -*- linux-c -*- | 1 | /* i915_mem.c -- Simple agp/fb memory manager for i915 -*- linux-c -*- |
| 2 | */ | 2 | */ |
| 3 | /************************************************************************** | 3 | /* |
| 4 | * | ||
| 5 | * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. | 4 | * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. |
| 6 | * All Rights Reserved. | 5 | * All Rights Reserved. |
| 7 | * | 6 | * |
| @@ -25,7 +24,7 @@ | |||
| 25 | * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | 24 | * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
| 26 | * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 25 | * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 27 | * | 26 | * |
| 28 | **************************************************************************/ | 27 | */ |
| 29 | 28 | ||
| 30 | #include "drmP.h" | 29 | #include "drmP.h" |
| 31 | #include "drm.h" | 30 | #include "drm.h" |