diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 18:17:32 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 18:17:32 +0100 |
| commit | 2e9abdd9bad485970b37cd53a82f92702054984c (patch) | |
| tree | 8f473a59aae906e65d0f78bbc98a8db12401d5d2 /drivers/char/agp/amd64-agp.c | |
| parent | [PATCH] x86_64: Add cpu_relax() to busy loops in PM timer code (diff) | |
| parent | [AGPGART] x86_64: Enable VIA AGP driver on x86-64 for VIA P4 chipsets (diff) | |
| download | linux-2e9abdd9bad485970b37cd53a82f92702054984c.tar.xz linux-2e9abdd9bad485970b37cd53a82f92702054984c.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] x86_64: Enable VIA AGP driver on x86-64 for VIA P4 chipsets
[AGPGART] x86_64: Fix wrong PCI ID for ALI M1695 AGP bridge
[AGPGART] ATI RS350 support.
[AGPGART] Lots of CodingStyle/whitespace cleanups.
Diffstat (limited to 'drivers/char/agp/amd64-agp.c')
| -rw-r--r-- | drivers/char/agp/amd64-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 7c6c7268e236..36517d4d1ad9 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c @@ -216,7 +216,7 @@ static struct aper_size_info_32 amd_8151_sizes[7] = {256, 65536, 6, 0x00000700 }, /* 1 1 1 0 0 0 */ {128, 32768, 5, 0x00000720 }, /* 1 1 1 1 0 0 */ {64, 16384, 4, 0x00000730 }, /* 1 1 1 1 1 0 */ - {32, 8192, 3, 0x00000738 } /* 1 1 1 1 1 1 */ + {32, 8192, 3, 0x00000738 } /* 1 1 1 1 1 1 */ }; static int amd_8151_configure(void) |