[Usbatm-commits] speedtch speedtch.c,1.27,1.28

[David Woodhouse]

Update of /home/cvs/speedtch
In directory phoenix.infradead.org:/tmp/cvs-serv18191

Modified Files:
	speedtch.c 
Log Message:
Put firmware loading in #ifdef USE_FW_LOADER

Index: speedtch.c
===================================================================
RCS file: /home/cvs/speedtch/speedtch.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- speedtch.c	5 Oct 2004 10:34:14 -0000	1.27
+++ speedtch.c	5 Oct 2004 12:25:53 -0000	1.28
@@ -463,6 +463,8 @@
 	mod_timer(&instance->poll_timer, jiffies + (5 * HZ));
 }
 
+#ifdef USE_FW_LOADER
+
 static void speedtch_upload_firmware(struct speedtch_instance_data *instance,
 				     const struct firmware *fw1,
 				     const struct firmware *fw2)
@@ -590,9 +592,9 @@
 	speedtch_got_firmware(instance, 0);
 }
 
-static inline int speedtch_find_firmware(struct speedtch_instance_data
-					 *instance, int phase,
-					 const struct firmware **fw_p)
+static int speedtch_find_firmware(struct speedtch_instance_data
+				  *instance, int phase,
+				  const struct firmware **fw_p)
 {
 	char buf[24];
 	const u16 bcdDevice = instance->u.usb_dev->descriptor.bcdDevice;
@@ -640,6 +642,7 @@
 	udsl_put_instance(&instance->u);
 	return 0;
 }
+#endif /* USE_FW_LOADER */
 
 static void speedtch_firmware_start(struct speedtch_instance_data *instance)
 {