From patchwork Mon Jul 4 14:22:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 103109 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 25441B6F6E for ; Tue, 5 Jul 2011 00:22:31 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Qdk2S-000258-Rn; Mon, 04 Jul 2011 14:22:16 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Qdk2R-00024t-Dk for kernel-team@lists.ubuntu.com; Mon, 04 Jul 2011 14:22:15 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Qdk2R-0004Mq-5n; Mon, 04 Jul 2011 14:22:15 +0000 Received: from 212-139-221-126.dynamic.dsl.as9105.com ([212.139.221.126] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1Qdk2R-00068Q-2J; Mon, 04 Jul 2011 14:22:15 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: SAUCE: rtl8192se: Force a build for a 2.6/3.0 kernel Date: Mon, 4 Jul 2011 15:22:13 +0100 Message-Id: <1309789333-19985-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309789333-19985-1-git-send-email-apw@canonical.com> References: <1309789333-19985-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Tim Gardner BugLink: http://bugs.launchpad.net/bugs/805494 The makefile for this module is hideaous. It checkes the build host kernel version in order to determine which driver version should be built. Since we know it will only _ever_ be built for 2.6/3.0, then just shortcut the ifeq(). Signed-off-by: Tim Gardner Signed-off-by: Andy Whitcroft Acked-by: Stefan Bader Acked-by: Tim Gardner --- ubuntu/rtl8192se/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ubuntu/rtl8192se/Makefile b/ubuntu/rtl8192se/Makefile index 0f2c735..6ad0730 100755 --- a/ubuntu/rtl8192se/Makefile +++ b/ubuntu/rtl8192se/Makefile @@ -4,7 +4,7 @@ CC = gcc KVER := $(shell uname -r) MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ -ifeq ($(shell uname -r|cut -d. -f1,2), 2.6) +ifeq (1,1) ###################### KERNEL 2.6 ################################ ifeq ($(NIC_SELECT),RTL8192CE) sub_folder = rtl8192c