From: David Vrabel <dvrabel@cantab.net>
To: Linux Kernel <linux-kernel@vger.kernel.org>
Cc: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Subject: [patch] yenta: fix YENTA && !CARDBUS build
Date: Fri, 07 Oct 2005 14:43:22 +0100 [thread overview]
Message-ID: <43467B7A.2000903@cantab.net> (raw)
In-Reply-To: <43414BFB.3090206@arcom.com>
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
(Previous patch left a warning.)
yenta_socket no longer builds if CONFIG_CARDBUS is disabled. It doesn't
look like ene_tune_bridge is relevant in the !CARDBUS configuration so
I've just disabled it.
[-- Attachment #2: yenta-not-CARDBUS-build-fix --]
[-- Type: text/plain, Size: 986 bytes --]
yenta: fix build if YENTA && !CARDBUS
(struct pcmcia_socket).tune_bridge only exists if CONFIG_CARDBUS is set but
building yenta_socket without CardBus is valid.
Signed-off-by: David Vrabel <dvrabel@arcom.com>
Index: linux-2.6-working/drivers/pcmcia/ti113x.h
===================================================================
--- linux-2.6-working.orig/drivers/pcmcia/ti113x.h 2005-10-04 15:08:31.000000000 +0100
+++ linux-2.6-working/drivers/pcmcia/ti113x.h 2005-10-04 15:42:25.000000000 +0100
@@ -873,6 +873,7 @@
* Some fixup code to make everybody happy (TM).
*/
+#ifdef CONFIG_CARDBUS
/**
* set/clear various test bits:
* Defaults to clear the bit.
@@ -927,7 +928,6 @@
config_writeb(socket, ENE_TEST_C9, test_c9);
}
-
static int ene_override(struct yenta_socket *socket)
{
/* install tune_bridge() function */
@@ -935,6 +935,9 @@
return ti1250_override(socket);
}
+#else
+# define ene_override ti1250_override
+#endif
#endif /* _LINUX_TI113X_H */
next prev parent reply other threads:[~2005-10-07 13:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-03 15:19 [patch] yenta: fix YENTA && !CARDBUS build David Vrabel
2005-10-07 13:43 ` David Vrabel [this message]
2005-10-07 16:34 ` Jiri Slaby
2005-10-07 19:07 ` Russell King
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=43467B7A.2000903@cantab.net \
--to=dvrabel@cantab.net \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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).