diff options
-rw-r--r-- | drivers/char/agp/amd64-agp.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 1afb8968a342..34cf04e21795 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -729,9 +729,6 @@ int __init agp_amd64_init(void) | |||
729 | if (agp_off) | 729 | if (agp_off) |
730 | return -EINVAL; | 730 | return -EINVAL; |
731 | 731 | ||
732 | if (gart_iommu_aperture) | ||
733 | return agp_bridges_found ? 0 : -ENODEV; | ||
734 | |||
735 | err = pci_register_driver(&agp_amd64_pci_driver); | 732 | err = pci_register_driver(&agp_amd64_pci_driver); |
736 | if (err < 0) | 733 | if (err < 0) |
737 | return err; | 734 | return err; |
@@ -768,6 +765,14 @@ int __init agp_amd64_init(void) | |||
768 | return err; | 765 | return err; |
769 | } | 766 | } |
770 | 767 | ||
768 | static int __init agp_amd64_mod_init(void) | ||
769 | { | ||
770 | if (gart_iommu_aperture) | ||
771 | return agp_bridges_found ? 0 : -ENODEV; | ||
772 | |||
773 | return agp_amd64_init(); | ||
774 | } | ||
775 | |||
771 | static void __exit agp_amd64_cleanup(void) | 776 | static void __exit agp_amd64_cleanup(void) |
772 | { | 777 | { |
773 | if (gart_iommu_aperture) | 778 | if (gart_iommu_aperture) |
@@ -777,7 +782,7 @@ static void __exit agp_amd64_cleanup(void) | |||
777 | pci_unregister_driver(&agp_amd64_pci_driver); | 782 | pci_unregister_driver(&agp_amd64_pci_driver); |
778 | } | 783 | } |
779 | 784 | ||
780 | module_init(agp_amd64_init); | 785 | module_init(agp_amd64_mod_init); |
781 | module_exit(agp_amd64_cleanup); | 786 | module_exit(agp_amd64_cleanup); |
782 | 787 | ||
783 | MODULE_AUTHOR("Dave Jones <davej@redhat.com>, Andi Kleen"); | 788 | MODULE_AUTHOR("Dave Jones <davej@redhat.com>, Andi Kleen"); |