diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/net/3c505.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/net/3c505.c')
| -rw-r--r-- | drivers/net/3c505.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index e4b6ed4a0..ba6d5839a 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c @@ -130,15 +130,15 @@ static const char *invalid_pcb_msg = #define INVALID_PCB_MSG(len) \ printk(invalid_pcb_msg, (len),filename,__FUNCTION__,__LINE__) -static const char *search_msg = "%s: Looking for 3c505 adapter at address %#x..."; +static char search_msg[] __initdata = "%s: Looking for 3c505 adapter at address %#x..."; -static const char *stilllooking_msg = "still looking..."; +static char stilllooking_msg[] __initdata = "still looking..."; -static const char *found_msg = "found.\n"; +static char found_msg[] __initdata = "found.\n"; -static const char *notfound_msg = "not found (reason = %d)\n"; +static char notfound_msg[] __initdata = "not found (reason = %d)\n"; -static const char *couldnot_msg = "%s: 3c505 not found\n"; +static char couldnot_msg[] __initdata = "%s: 3c505 not found\n"; /********************************************************* * @@ -180,7 +180,7 @@ static const int elp_debug = 0; * Last element MUST BE 0! *****************************************************************/ -static const int addr_list[] __initdata = {0x300, 0x280, 0x310, 0}; +static int addr_list[] __initdata = {0x300, 0x280, 0x310, 0}; /* Dma Memory related stuff */ |