patch-2.4.0-test5 linux/drivers/parport/daisy.c

• Lines: 23
• Date: Fri Jul 21 14:21:58 2000
• Orig file: v2.4.0-test4/linux/drivers/parport/daisy.c
• Orig date: Mon Jul 10 16:47:24 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/parport/daisy.c linux/drivers/parport/daisy.c
@@ -14,10 +14,9 @@
  * 13-03-1999: Get DeviceID from non-IEEE 1284.3 devices too.
  * 22-02-2000: Count devices that are actually detected.
  *
- * The block comments above the functions in this file are
- * licensed as part of the generated file
- * Documentation/DocBook/parportbook.sgml under the GNU Free
- * Documentation License.
+ * Any part of this program may be used in documents licensed under
+ * the GNU Free Documentation License, Version 1.1 or any later version
+ * published by the Free Software Foundation.
  */
 
 #include <linux/parport.h>
@@ -51,7 +50,7 @@
 static void add_dev (int devnum, struct parport *port, int daisy)
 {
 	struct daisydev *newdev;
-	newdev = kmalloc (GFP_KERNEL, sizeof (struct daisydev));
+	newdev = kmalloc (sizeof (struct daisydev), GFP_KERNEL);
 	if (newdev) {
 		newdev->port = port;
 		newdev->daisy = daisy;