From 378b8e9b866452112b5da30e9c64a048dc4c44dd Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 6 Oct 2009 17:29:11 -0600 Subject: [PATCH 1/1] UBUNTU: SAUCE: Use MODULE_IMPORT macro to tie intel_agp to i915 BugLink: http://bugs.launchpad.net/bugs/430694 Symbolicly link i915 and intel_agp, forcing intel_agp to get loaded first. Signed-off-by: Tim Gardner --- drivers/char/agp/intel-agp.c | 1 + drivers/gpu/drm/i915/i915_drv.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 6a45365..9c6b68e 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -2448,5 +2448,6 @@ static void __exit agp_intel_cleanup(void) module_init(agp_intel_init); module_exit(agp_intel_cleanup); +MODULE_EXPORT(intel_agp); MODULE_AUTHOR("Dave Jones "); MODULE_LICENSE("GPL and additional rights"); diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index c078d99..e4d7056 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -261,6 +261,7 @@ static void __exit i915_exit(void) module_init(i915_init); module_exit(i915_exit); +MODULE_IMPORT(intel_agp); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL and additional rights"); -- 1.7.0.4