Skip to contentSkip to conversation

yenta: fix YENTA && !CARDBUS build

PATCH New David Vrabel 4 participants 4 messages Oct 3, 2005 – Oct 7, 2005 Pcmcia

lore
Share & tools
lore

David Vrabel

author
#0 lore raw

PATCH 1/1 yenta: fix YENTA && !CARDBUS build

Hi,

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.

David Vrabel

Signature · 4 lines
David Vrabel, Design Engineer

Arcom, Clifton Road           Tel: +44 (0)1223 411200 ext. 3233
Cambridge CB1 7EA, UK         Web: http://www.arcom.com/

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]>
drivers/pcmcia/ti113x.h +4 -1
Index: linux-2.6-working/drivers/pcmcia/ti113x.h
===================================================================
@@ -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 */
#1 lore raw

PATCH 1/1 yenta: fix YENTA && !CARDBUS build

(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.

Signed-off-by David Vrabel <[email protected]>
drivers/pcmcia/ti113x.h +4 -1
Index: linux-2.6-working/drivers/pcmcia/ti113x.h
===================================================================
@@ -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 */
#2 lore raw
Quoted 7 lines · David Vrabel

(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.

Quoted 5 lines

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 www.fi.muni.cz/~xslaby
~\-/~ [email protected] ~\-/~
B67499670407CE62ACC8 22A032CC55C339D47A7E

#3 lore raw
Quoted 10 lines · Jiri Slaby
Quoted 9 lines · David Vrabel

(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

Quoted 8 lines
Quoted 3 lines

(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.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core