diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/net/arlan.h | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/net/arlan.h')
| -rw-r--r-- | drivers/net/arlan.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/arlan.h b/drivers/net/arlan.h index 4b52ee59b..f0c19eacc 100644 --- a/drivers/net/arlan.h +++ b/drivers/net/arlan.h @@ -29,7 +29,7 @@ #include <linux/etherdevice.h> -//#define ARLAN_DEBUGING 1 +//#define ARLAN_DEBUGGING 1 #define ARLAN_PROC_INTERFACE #define MAX_ARLANS 4 /* not more than 4 ! */ @@ -50,7 +50,6 @@ extern int arlan_debug; extern char * siteName; extern int arlan_entry_debug; extern int arlan_exit_debug; -extern int arlan_entry_and_exit_debug; extern int testMemory; extern const char* arlan_version; extern int arlan_command(struct net_device * dev, int command); @@ -76,9 +75,9 @@ extern int arlan_command(struct net_device * dev, int command); #define IFDEBUG( L ) if ( (L) & arlan_debug ) #define ARLAN_FAKE_HDR_LEN 12 -#ifdef ARLAN_DEBUGING +#ifdef ARLAN_DEBUGGING #define DEBUG 1 - #define ARLAN_ENTRY_EXIT_DEBUGING 1 + #define ARLAN_ENTRY_EXIT_DEBUGGING 1 #define ARLAN_DEBUG(a,b) printk(KERN_DEBUG a, b) #else #define ARLAN_DEBUG(a,b) @@ -321,7 +320,7 @@ struct arlan_conf_stru { int tx_queue_len; }; -struct arlan_conf_stru arlan_conf[MAX_ARLANS]; +extern struct arlan_conf_stru arlan_conf[MAX_ARLANS]; struct TxParam { |