---

yaml --- r: 180453 b: refs/heads/master c: 06df6da h: refs/heads/master i: 180451: bd697b1 v: v3
git-mirror · Feb 4, 2010 · 80fcb72 · 80fcb72
1 parent b155026
commit 80fcb72
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab09809f2eee1dc2d8f8bea636e77d176ba6c648
+refs/heads/master: 06df6dafb5d9e3cfa3588c6ce79328b91582b6af
diff --git a/trunk/drivers/char/agp/amd64-agp.c b/trunk/drivers/char/agp/amd64-agp.c
@@ -767,16 +767,19 @@ int __init agp_amd64_init(void)
 
 static int __init agp_amd64_mod_init(void)
 {
+#ifndef MODULE
 	if (gart_iommu_aperture)
 		return agp_bridges_found ? 0 : -ENODEV;
-
+#endif
 	return agp_amd64_init();
 }
 
 static void __exit agp_amd64_cleanup(void)
 {
+#ifndef MODULE
 	if (gart_iommu_aperture)
 		return;
+#endif
 	if (aperture_resource)
 		release_resource(aperture_resource);
 	pci_unregister_driver(&agp_amd64_pci_driver);