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 <[email protected]>
Index: linux-2.6-working/drivers/pcmcia/ti113x.h
===================================================================
--- linux-2.6-working.orig/drivers/pcmcia/ti113x.h 2005-10-03 14:44:14.000000000 +0100
+++ linux-2.6-working/drivers/pcmcia/ti113x.h 2005-10-03 15:05:12.000000000 +0100
@@ -899,6 +899,7 @@
{}
};
+#ifdef CONFIG_CARDBUS
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
{
struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket);
@@ -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 */
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 <[email protected]>
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 */
On 10/7/05, David Vrabel <[email protected]> wrote:
> (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.
>
>
> 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.
>
This is a multi-part message in MIME format.
Are you really sure, that you have read Documentation/SubmittingPatches and
http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
Nobody wants MIMEs. Include it as plain text
thanks,
Jiri Slaby http://www.fi.muni.cz/~xslaby
~\-/~ [email protected] ~\-/~
B67499670407CE62ACC8 22A032CC55C339D47A7E
On Fri, Oct 07, 2005 at 06:34:15PM +0200, Jiri Slaby wrote:
> On 10/7/05, David Vrabel <[email protected]> wrote:
> > (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.
> >
> >
> > 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.
> >
> This is a multi-part message in MIME format.
>
> Are you really sure, that you have read Documentation/SubmittingPatches and
> http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
> Nobody wants MIMEs. Include it as plain text
You're providing misleading advice. mimes are acceptable provided
each part is text/plain. And some folk need to attach rather than
inline patches to prevent white space damage from broken mailers.
And indeed David's were text/plain so there isn't a problem.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core