diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-17 10:14:18 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2007-04-17 10:14:18 -0700 |
| commit | 1c7f895fa6531b16e7e9fd4568d4f6a50ca5711e (patch) | |
| tree | b46163c3b5f98e18d3ad1c70c095d77fc71721e6 /shared-core/i915_drv.h | |
| parent | 4e4d9cbeb3f52b605e46aad8ae1a947ca236079f (diff) | |
| parent | b729b919baed250313caf3f0bbd4044e084de8bf (diff) | |
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Conflicts:
shared-core/i915_init.c - reconcile with airlied's new code
Diffstat (limited to 'shared-core/i915_drv.h')
| -rw-r--r-- | shared-core/i915_drv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index b0d70124..2dd76d30 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -93,7 +93,6 @@ typedef struct drm_i915_private { drm_local_map_t *sarea; drm_local_map_t *mmio_map; - unsigned long baseaddr; unsigned long mmiobase; unsigned long mmiolen; |