2 files changed, 8 insertions, 1 deletions

diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 1d5d75711..ff8e44446 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -154,10 +154,16 @@ our %l = (
       qw(mxser moxa isicom wdt_pci epca synclink istallion sonypi i810-tco sx), #- what are these???
     ],
     other => [
-      qw(agpgart defxx i810_rng i810fb ide-floppy ide-scsi ide-tape loop lp nbd sg st),
+      qw(defxx i810_rng i810fb ide-floppy ide-scsi ide-tape loop lp nbd sg st),
       qw(parport parport_pc parport_serial),
       qw(btaudio),
 
+      if_(arch() =~ /alpha/, qw(alpha-agp)),
+      if_(arch() =~ /ia64/, qw(hp-agp i460-agp)),
+      if_(arch() =~ /ppc/, qw(uninorth-agp)),
+
+      qw(agpgart ali-agp amd64-agp amd-k7-agp ati-agp intel-agp),
+	 qw(nvidia-agp sworks-agp sis-agp via-agp),
       #- these need checking
       qw(pcilynx sktr rrunner meye 3c559 buz paep),
     ],
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index f67e0e098..b7cd594a5 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -378,6 +378,7 @@ sub when_load {
     load('snd-pcm-oss') if $name =~ /^snd-/;
     add_alias('ieee1394-controller', $name) if member($name, 'ohci1394');
     add_probeall('usb-interface', $name) if $name =~ /usb-[uo]hci/ || $name eq 'ehci-hcd';
+    add_alias('/dev/agpgart', $name) if $name =~ /-agp$/;
 
     $conf{$name}{options} = join " ", @options if @options;