diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 09:16:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 09:16:12 -0700 |
| commit | 889e5528cbe7dff2e91caf48f4bb23c17748b984 (patch) | |
| tree | af66c15b48efb49926c475bbb4f33f48e1a76c40 /drivers/gpu/drm/radeon/radeon_drv.c | |
| parent | Merge 3.5-rc3 into usb-next (diff) | |
| parent | Linux 3.5-rc4 (diff) | |
| download | linux-dev-889e5528cbe7dff2e91caf48f4bb23c17748b984.tar.xz linux-dev-889e5528cbe7dff2e91caf48f4bb23c17748b984.zip | |
Merge 3.5-rc4 into usb-next
This is to get the USB fixes that were merged in the 3.5-rc4 tree into usb-next
so that everyone can sync up properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 03e5f5df40f1..2c4d53fd20c5 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -58,9 +58,10 @@ * 2.14.0 - add evergreen tiling informations * 2.15.0 - add max_pipes query * 2.16.0 - fix evergreen 2D tiled surface calculation + * 2.17.0 - add STRMOUT_BASE_UPDATE for r7xx */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 16 +#define KMS_DRIVER_MINOR 17 #define KMS_DRIVER_PATCHLEVEL 0 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); int radeon_driver_unload_kms(struct drm_device *dev); |