diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
| commit | 1e90b7ee8cefff59b70e285557aa7920dea77e81 (patch) | |
| tree | 2132e5dcee9e5ef9693742100953063cd6423b3a /linux-core/mga_drv.c | |
| parent | 0c34d0f31a691bb649ed69f19e93fc1a723aa1d4 (diff) | |
| parent | 7b6cd95bb6c41653aed78952da0a461bd4791413 (diff) | |
Merge branch 'master' into nouveau-1
Conflicts:
linux-core/Makefile.kernel
Diffstat (limited to 'linux-core/mga_drv.c')
| -rw-r--r-- | linux-core/mga_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c index 3a1e4b25..ef6f1e44 100644 --- a/linux-core/mga_drv.c +++ b/linux-core/mga_drv.c @@ -29,7 +29,6 @@ * Gareth Hughes <gareth@valinux.com> */ -#include <linux/config.h> #include "drmP.h" #include "drm.h" #include "mga_drm.h" @@ -49,6 +48,7 @@ static struct drm_driver driver = { DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL, + .dev_priv_size = sizeof (drm_mga_buf_priv_t), .load = mga_driver_load, .unload = mga_driver_unload, .lastclose = mga_driver_lastclose, |