From 012bb3e61e5eced6c610f9e036372bf0c8def2d1 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Oct 2000 01:18:40 +0000 Subject: 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. --- drivers/net/3c505.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/net/3c505.c') 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 */ -- cgit v1.2.3