leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonfb: fix debug option

Browse Source 
Fix CONFIG_FB_RADEON_DEBUG.  DEBUG must be defined before including any kernel
header, otherwise dev_dbg() resolves to a no-op.  Also, when debugging is
disabled, don't set DEBUG at all instead of setting it to 0, to comply with
what the kernel headers expect.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jean Delvare 2008-04-28 02:15:12 -07:00 committed by Linus Torvalds
parent e7a18c9c86
commit b0313f8967
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/video/aty/radeon_base.c
View File

@ -52,6 +52,8 @@
#define RADEON_VERSION "0.2.0"
#include "radeonfb.h"
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
@ -92,7 +94,6 @@
#include "../edid.h" // MOVE THAT TO include/video
#include "ati_ids.h"
#include "radeonfb.h"
#define MAX_MAPPED_VRAM (2048*2048*4)
#define MIN_MAPPED_VRAM (1024*768*1)

3
drivers/video/aty/radeon_i2c.c
View File

@ -1,3 +1,5 @@
#include "radeonfb.h"
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/delay.h>
@ -11,7 +13,6 @@
#include <asm/io.h>
#include <video/radeon.h>
#include "radeonfb.h"
#include "../edid.h"
static void radeon_gpio_setscl(void* data, int state)

2
drivers/video/aty/radeon_monitor.c
View File

@ -481,7 +481,7 @@ void __devinit radeon_probe_screens(struct radeonfb_info *rinfo,
RTRACE("Starting monitor auto detection...\n");
#if DEBUG && defined(CONFIG_FB_RADEON_I2C)
#if defined(DEBUG) && defined(CONFIG_FB_RADEON_I2C)
{
u8 *EDIDs[4] = { NULL, NULL, NULL, NULL };
int mon_types[4] = {MT_NONE, MT_NONE, MT_NONE, MT_NONE};

12
drivers/video/aty/radeonfb.h
View File

@ -1,6 +1,10 @@
#ifndef __RADEONFB_H__
#define __RADEONFB_H__
#ifdef CONFIG_FB_RADEON_DEBUG
#define DEBUG 1
#endif
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
@ -367,13 +371,7 @@ struct radeonfb_info {
/*
* Debugging stuffs
*/
#ifdef CONFIG_FB_RADEON_DEBUG
#define DEBUG 1
#else
#define DEBUG 0
#endif
#if DEBUG
#ifdef DEBUG
#define RTRACE printk
#else
#define RTRACE if(0) printk