From 80fcb72bba2905b1e3014aeb4a7273e2cd681cf6 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 4 Feb 2010 14:43:38 +0900 Subject: [PATCH] --- yaml --- r: 180453 b: refs/heads/master c: 06df6dafb5d9e3cfa3588c6ce79328b91582b6af h: refs/heads/master i: 180451: bd697b1dc0bc407c6f40f3a2885c6478ab1a69b8 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/amd64-agp.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 190dd44f07d8..ef965e296322 100644 --- 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 index 34cf04e21795..fd50ead59c79 100644 --- 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);