Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6-omap-h63xx.git] / drivers / char / drm / radeon_drv.c

diff --git a/drivers/char/drm/radeon_drv.c b/drivers/char/drm/radeon_drv.c
index b04ed1b562b9509c7e83635888c8f44baf6ae07b..2eb652ec674578c97f24cf1ca6c40b0d58a4454e 100644 (file)
--- a/drivers/char/drm/radeon_drv.c
+++ b/drivers/char/drm/radeon_drv.c
@@ -29,7 +29,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <linux/config.h>
 #include "drmP.h"
 #include "drm.h"
 #include "radeon_drm.h"
@@ -45,7 +44,7 @@ module_param_named(no_wb, radeon_no_wb, int, 0444);
 static int dri_library_name(struct drm_device *dev, char *buf)
 {
        drm_radeon_private_t *dev_priv = dev->dev_private;
-       int family = dev_priv->flags & CHIP_FAMILY_MASK;
+       int family = dev_priv->flags & RADEON_FAMILY_MASK;
 
        return snprintf(buf, PAGE_SIZE, "%s\n",
                        (family < CHIP_R200) ? "radeon" :