diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 20:36:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 20:36:17 -0700 |
| commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
| tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /drivers/net/wireless/netwave_cs.c | |
| parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
| parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'drivers/net/wireless/netwave_cs.c')
| -rw-r--r-- | drivers/net/wireless/netwave_cs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index c2d71afd57e..2402cb8dd32 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c @@ -4,18 +4,18 @@ * Version: 0.4.1 * Description: Netwave AirSurfer Wireless LAN PC Card driver * Status: Experimental. - * Authors: John Markus Bjørndalen <johnm@cs.uit.no> + * Authors: John Markus Bjørndalen <johnm@cs.uit.no> * Dag Brattli <dagb@cs.uit.no> * David Hinds <dahinds@users.sourceforge.net> * Created at: A long time ago! * Modified at: Mon Nov 10 11:54:37 1997 * Modified by: Dag Brattli <dagb@cs.uit.no> * - * Copyright (c) 1997 University of Tromsø, Norway + * Copyright (c) 1997 University of Tromsø, Norway * * Revision History: * - * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no> + * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no> * - Fixed some bugs in netwave_rx and cleaned it up a bit. * (One of the bugs would have destroyed packets when receiving * multiple packets per interrupt). @@ -158,7 +158,7 @@ static int pc_debug = PCMCIA_DEBUG; module_param(pc_debug, int, 0); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = -"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; +"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; #else #define DEBUG(n, args...) #endif |