Return-path: Received: from server19320154104.serverpool.info ([193.201.54.104]:44168 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090Ab2AWSB0 (ORCPT ); Mon, 23 Jan 2012 13:01:26 -0500 Message-ID: <4F1DA06C.5080605@hauke-m.de> (sfid-20120123_190128_407728_EECEF641) Date: Mon, 23 Jan 2012 19:01:16 +0100 From: Hauke Mehrtens MIME-Version: 1.0 To: "Luis R. Rodriguez" CC: Andreas Hartmann , linux-wireless@vger.kernel.org Subject: Re: [PATCH] compat: add __cancel_delayed_work() References: <1327153475-28081-1-git-send-email-hauke@hauke-m.de> <201201231755.q0NHtQUR002682@mail.maya.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 01/23/2012 06:57 PM, Luis R. Rodriguez wrote: > On Mon, Jan 23, 2012 at 9:55 AM, Andreas Hartmann > wrote: >> Luis R. Rodriguez schrieb: >>> On Sat, Jan 21, 2012 at 5:44 AM, Hauke Mehrtens wrote: >>>> __cancel_delayed_work is needed by include/net/bluetooth/l2cap.h and >>>> not available in old kernel versions. This was just copied from the >>>> kernel. >>>> >>>> This should also go into compat-wireless-stable-3.3. >>>> >>>> Signed-off-by: Hauke Mehrtens >>> >>> Thanks! Applied all onto compat-wireless.git and compat.git, in >>> addition to the linux-3.3.y branch for compat.git as you indicated for >>> this patch. Will roll out a new tarball right away. >> >> BTW: I've to apply always the following patch to some older >> compat-wireless packages (3.2 e.g) to get it compiled with kernel 3.1: >> >> --- drivers/misc/eeprom/Makefile.orig 2012-01-10 02:10:51.000000000 +0100 >> +++ drivers/misc/eeprom/Makefile 2012-01-10 05:14:40.082494612 +0100 >> @@ -1,3 +1,3 @@ >> obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o >> -obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o >> +# obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o >> obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o >> >> Is this eventually needed in 3.3, too? > > Why do you need this? Can you show your compile errors? > > Luis This is fixed in HEAD in this commit: commit 0db9fae8c40674f65cf50c78e6587b9c9d9e2735 Author: Hauke Mehrtens Date: Sat Dec 3 15:46:21 2011 +0100 compat-wireless: remove some modules from Makefile It should be backported to linux-3.1.y and linux-3.2.y. We just ship eeprom_93cx6.c and nothing else in this directory. Hauke