hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] Hand off AGP maintainence.
This commit is contained in:
Linus Torvalds 2007-07-12 13:41:54 -07:00
parent 0806ca2ab3 70e8992ec7
commit 2f41fc8064
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MAINTAINERS
View File

@ -315,10 +315,9 @@ M: zippel@linux-m68k.org
S: Maintained S: Maintained
AGPGART DRIVER AGPGART DRIVER
P: Dave Jones P: David Airlie
M: davej@codemonkey.org.uk M: airlied@linux.ie
W: http://www.codemonkey.org.uk/projects/agp/ T: git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
T: git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git
S: Maintained S: Maintained
AHA152X SCSI DRIVER AHA152X SCSI DRIVER

2
drivers/char/agp/backend.c
View File

@ -321,7 +321,7 @@ EXPORT_SYMBOL(agp_try_unsupported_boot);
static int __init agp_init(void) static int __init agp_init(void)
{ {
if (!agp_off) if (!agp_off)
printk(KERN_INFO "Linux agpgart interface v%d.%d (c) Dave Jones\n", printk(KERN_INFO "Linux agpgart interface v%d.%d\n",
AGPGART_VERSION_MAJOR, AGPGART_VERSION_MINOR); AGPGART_VERSION_MAJOR, AGPGART_VERSION_MINOR);
return 0; return 0;
} }