Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: add quirk to make HP DV5000 laptop resume
  drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl
  Fix ttm_page_alloc.c build breakage
  drm/radeon/kms: fix legacy LVDS dpms sequence
  drm/radeon/kms: drop taking lock around crtc lookup.

diff --combined drivers/gpu/drm/ttm/ttm_page_alloc.c
index d233c65f3f7fbe4506b5e933a29ced7b323121a8,f394b3b2fadf91fd5caa088d5204ea57882579a9..ca904799f018a6e3ae23c80933bd1e007aec8f7f
--- 1/drivers/gpu/drm/ttm/ttm_page_alloc.c
--- 2/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@@ -40,13 -40,13 +40,13 @@@
  #include <linux/slab.h>
  
  #include <asm/atomic.h>
- #ifdef TTM_HAS_AGP
- #include <asm/agp.h>
- #endif
  
  #include "ttm/ttm_bo_driver.h"
  #include "ttm/ttm_page_alloc.h"
  
+ #ifdef TTM_HAS_AGP
+ #include <asm/agp.h>
+ #endif
  
  #define NUM_PAGES_TO_ALLOC            (PAGE_SIZE/sizeof(struct page *))
  #define SMALL_ALLOCATION              16
@@@ -394,7 -394,7 +394,7 @@@ static int ttm_pool_get_num_unused_page
  /**
   * Callback for mm to request pool to reduce number of page held.
   */
 -static int ttm_pool_mm_shrink(int shrink_pages, gfp_t gfp_mask)
 +static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask)
  {
        static atomic_t start_pool = ATOMIC_INIT(0);
        unsigned i;