diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
| commit | f3627cbe9236a062012c836f3b6ee311b43f63f2 (patch) | |
| tree | ae854838b9a73b35bd0f3b8f42e5fb7f9cb1d5a9 /drivers/parport | |
| parent | fea12a7b3f20bc135ab533491411e9ff753c01c8 (diff) | |
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/daisy.c | 9 | ||||
| -rw-r--r-- | drivers/parport/ieee1284.c | 7 | ||||
| -rw-r--r-- | drivers/parport/share.c | 7 |
3 files changed, 10 insertions, 13 deletions
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c index 065bcf8df..573c5ef20 100644 --- a/drivers/parport/daisy.c +++ b/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 int assign_addrs (struct parport *port); 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; diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c index c148a5b0c..0d84fd1a1 100644 --- a/drivers/parport/ieee1284.c +++ b/drivers/parport/ieee1284.c @@ -9,10 +9,9 @@ * This file is responsible for IEEE 1284 negotiation, and for handing * read/write requests to low-level drivers. * - * 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/config.h> diff --git a/drivers/parport/share.c b/drivers/parport/share.c index 92618e7b4..c4c6a44b3 100644 --- a/drivers/parport/share.c +++ b/drivers/parport/share.c @@ -10,10 +10,9 @@ * based on work by Grant Guenther <grant@torque.net> * and Philip Blundell * - * 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. */ #undef PARPORT_DEBUG_SHARING /* undef for production */ |