diff options
author | H. Peter Anvin <hpa@zytor.com> | 2010-02-20 21:51:42 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-20 22:54:05 -0800 |
commit | aef55d4922e62a0d887e60d87319f3718aec6ced (patch) | |
tree | e81bdf46d49fa3421747b2b2074aaeae3aee890b /drivers | |
parent | ca4dbc668412d5fe039be3e26e8e717a616d1ca5 (diff) | |
parent | eb5b3794062824ba12d883901eea49ea89d0a678 (diff) |
Merge branch 'x86/urgent' into x86/irq
Merge reason: conflict in arch/x86/kernel/apic/io_apic.c
Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/agp/amd64-agp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 34cf04e2179..fd50ead59c7 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/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); |