diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/video/tdfxfb.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/video/tdfxfb.c')
| -rw-r--r-- | drivers/video/tdfxfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index ff43c8885028..980548390048 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | * | 52 | * |
| 53 | * 0.1.3 (released 1999-11-02) added Attila's panning support, code | 53 | * 0.1.3 (released 1999-11-02) added Attila's panning support, code |
| 54 | * reorg, hwcursor address page size alignment | 54 | * reorg, hwcursor address page size alignment |
| 55 | * (for mmaping both frame buffer and regs), | 55 | * (for mmapping both frame buffer and regs), |
| 56 | * and my changes to get rid of hardcoded | 56 | * and my changes to get rid of hardcoded |
| 57 | * VGA i/o register locations (uses PCI | 57 | * VGA i/o register locations (uses PCI |
| 58 | * configuration info now) | 58 | * configuration info now) |