diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 08:58:11 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 08:58:11 -0500 |
| commit | 249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e (patch) | |
| tree | 7fc06930e46ee13d394f5b031166c40206af3189 /drivers/video/aty/radeonfb.h | |
| parent | 44581a28e805a31661469c4b466b9cd14b36e7b6 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into core/percpu
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
Diffstat (limited to 'drivers/video/aty/radeonfb.h')
| -rw-r--r-- | drivers/video/aty/radeonfb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h index 3ea1b00fdd22..7351e66c7f54 100644 --- a/drivers/video/aty/radeonfb.h +++ b/drivers/video/aty/radeonfb.h | |||
| @@ -361,8 +361,6 @@ struct radeonfb_info { | |||
| 361 | #ifdef CONFIG_FB_RADEON_I2C | 361 | #ifdef CONFIG_FB_RADEON_I2C |
| 362 | struct radeon_i2c_chan i2c[4]; | 362 | struct radeon_i2c_chan i2c[4]; |
| 363 | #endif | 363 | #endif |
| 364 | |||
| 365 | u32 cfg_save[64]; | ||
| 366 | }; | 364 | }; |
| 367 | 365 | ||
| 368 | 366 | ||