From: Hauke Mehrtens <hauke@hauke-m.de>
To: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h
Date: Tue, 11 Aug 2009 22:53:07 +0200 [thread overview]
Message-ID: <4A81DA33.1050405@hauke-m.de> (raw)
In-Reply-To: <43e72e890908101520x19fddcddx72215fb0851baf2f@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2020 bytes --]
Hi Luis,
Thank you for applying the rest of the patches. Next time I will use
--cover-letter when generating the patches.
Luis R. Rodriguez wrote:
> On Sat, Aug 8, 2009 at 5:38 AM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
>> fix build:
>> undef pcmcia_parse_tuple before redefine it again.
>>
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> ---
>> compat/compat-2.6.28.h | 8 +++++++-
>> 1 files changed, 7 insertions(+), 1 deletions(-)
>>
>> diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
>> index fdc021a..e25259f 100644
>> --- a/compat/compat-2.6.28.h
>> +++ b/compat/compat-2.6.28.h
>> @@ -29,7 +29,13 @@
>> })
>> #endif /* From include/asm-generic/bug.h */
>>
>> -#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
>> +#include <pcmcia/cs_types.h>
>> +#include <pcmcia/cs.h>
>> +#include <pcmcia/cistpl.h>
>> +#ifdef pcmcia_parse_tuple
>> +#undef pcmcia_parse_tuple
>> +#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
>> +#endif
>
> Where did pccard_parse_tuple() come from?
In include/pcmcia/cistpl.h pcmcia_parse_tuple(p_dev, tuple, parse) is
defined as pccard_parse_tuple(tuple, parse)
> Did you see the commit 0df8084caf53774113c8f118e9dd43e660cf9e15 by any
> chance? That fixed compilation for me against older kernels.
I still get a compile error with recent compat-wireless including commit
0df8084caf53774113c8f118e9dd43e660cf9e15 with kernel <= 2.6.27 in Ubuntu:
In file included from
/compat-wireless-git/drivers/net/wireless/b43/pcmcia.c:30:
include/pcmcia/cistpl.h:610:1: warning: "pcmcia_parse_tuple" redefined
In file included from /compat-wireless-git/include/net/compat.h:19,
from <command-line>:0:
/compat-wireless-git/include/net/compat-2.6.28.h:32:1: warning: this is
the location of the previous definition
The above patch fixes it for me. The patch does not look relay nice, do
you have a better idea how to solve this problem?
Hauke
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 898 bytes --]
next prev parent reply other threads:[~2009-08-11 20:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-08 12:38 [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 2/7] [compat-2.6] Add missing compat-2.6.*.c files Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h Hauke Mehrtens
2009-08-10 22:20 ` Luis R. Rodriguez
2009-08-11 20:53 ` Hauke Mehrtens [this message]
2009-08-11 21:04 ` Luis R. Rodriguez
2009-08-13 2:03 ` Luis R. Rodriguez
2009-08-08 12:38 ` [PATCH 4/7] [compat-2.6] Clean up compat-2.6.26.c Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 5/7] [compat-2.6] Remove wext building Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 6/7] [compat-2.6] Rename CONFIG_IWL4965 symbol Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 7/7] [compat-2.6] Remove unsed code Hauke Mehrtens
2009-08-10 22:49 ` Luis R. Rodriguez
2009-08-10 22:50 ` [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A81DA33.1050405@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=linux-wireless@vger.kernel.org \
--cc=lrodriguez@atheros.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).