diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/media/video/tvp5150.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/media/video/tvp5150.c')
| -rw-r--r-- | drivers/media/video/tvp5150.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 81e6d4494e7d..97431e26d229 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
| @@ -31,7 +31,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); | |||
| 31 | #define dprintk(num, format, args...) \ | 31 | #define dprintk(num, format, args...) \ |
| 32 | do { \ | 32 | do { \ |
| 33 | if (debug >= num) \ | 33 | if (debug >= num) \ |
| 34 | printk(format , ##args); \ | 34 | printk(format, ##args); \ |
| 35 | } while (0) | 35 | } while (0) |
| 36 | 36 | ||
| 37 | /* supported controls */ | 37 | /* supported controls */ |
| @@ -770,7 +770,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter, | |||
| 770 | 770 | ||
| 771 | if (debug > 1) | 771 | if (debug > 1) |
| 772 | dump_reg(client); | 772 | dump_reg(client); |
| 773 | |||
| 774 | return 0; | 773 | return 0; |
| 775 | } | 774 | } |
| 776 | 775 | ||