From patchwork Tue Oct 6 16:12:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 35126 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id E1EC0B7C3A for ; Wed, 7 Oct 2009 03:13:14 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1MvCew-0001e3-JC; Tue, 06 Oct 2009 17:13:06 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1MvCep-0001c3-Ck for kernel-team@lists.ubuntu.com; Tue, 06 Oct 2009 17:13:00 +0100 Received: from [10.0.2.5] (unknown [10.0.2.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id 759B01EF622; Tue, 6 Oct 2009 09:12:38 -0700 (PDT) Message-ID: <4ACB6C89.4030407@canonical.com> Date: Tue, 06 Oct 2009 10:12:57 -0600 From: Tim Gardner User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Andy Whitcroft Subject: Hard module dependencies X-Enigmail-Version: 0.95.7 Cc: Kernel team list X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.8 Precedence: list Reply-To: tim.gardner@canonical.com List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Andy - How about something like this? I need to test some boundary conditions (like what happens if the target is not a module, etc), and flesh out the commit log, perhaps add some comments to the function. From 1fde7bd238eb7150fdf372192651d8e384768f06 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 6 Oct 2009 08:57:53 -0600 Subject: [PATCH 2/2] UBUNTU: [Upstream] i915: Depends on intel-agp Signed-off-by: Tim Gardner --- drivers/gpu/drm/i915/i915_drv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index c078d99..14f079c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -227,6 +227,7 @@ static struct drm_driver driver = { static int __init i915_init(void) { + module_depends("intel_agp"); driver.num_ioctls = i915_max_ioctl; /* -- 1.6.2.4