diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 09:17:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 09:17:32 -0800 |
commit | 2e9abdd9bad485970b37cd53a82f92702054984c (patch) | |
tree | 8f473a59aae906e65d0f78bbc98a8db12401d5d2 /drivers/char/agp/sgi-agp.c | |
parent | c36cd16f78a5dd740a619ef8445e35a73484d58b (diff) | |
parent | 9d1f6b28ee2429a1f94a9f7074ffae7f918d33be (diff) |
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/sgi-agp.c')
-rw-r--r-- | drivers/char/agp/sgi-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c index 4df7734b51c..cfa7922cb43 100644 --- a/drivers/char/agp/sgi-agp.c +++ b/drivers/char/agp/sgi-agp.c @@ -329,7 +329,7 @@ static int __devinit agp_sgi_init(void) static void __devexit agp_sgi_cleanup(void) { - if(sgi_tioca_agp_bridges) + if (sgi_tioca_agp_bridges) kfree(sgi_tioca_agp_bridges); sgi_tioca_agp_bridges=NULL; } |