diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-03 19:28:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-03 19:28:46 +0200 |
| commit | f68ec0c24755e5cdb779be6240925f2175311d84 (patch) | |
| tree | a7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /drivers/video/console/fbcon.h | |
| parent | 98920dc3d1113b883cbc73e3293446d3525c6042 (diff) | |
| parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff) | |
Merge commit 'v2.6.27-rc8' into x86/setup
Diffstat (limited to 'drivers/video/console/fbcon.h')
| -rw-r--r-- | drivers/video/console/fbcon.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h index 0135e039545..a6e38e9ea73 100644 --- a/drivers/video/console/fbcon.h +++ b/drivers/video/console/fbcon.h @@ -146,10 +146,8 @@ static inline int attr_col_ec(int shift, struct vc_data *vc, return is_fg ? fg : bg; } -#define attr_bgcol_ec(bgshift,vc,info) \ - attr_col_ec(bgshift,vc,info,0); -#define attr_fgcol_ec(fgshift,vc,info) \ - attr_col_ec(fgshift,vc,info,1); +#define attr_bgcol_ec(bgshift, vc, info) attr_col_ec(bgshift, vc, info, 0) +#define attr_fgcol_ec(fgshift, vc, info) attr_col_ec(fgshift, vc, info, 1) /* Font */ #define REFCOUNT(fd) (((int *)(fd))[-1]) |