Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b48194bf authored by Ben Collins's avatar Ben Collins Committed by David S. Miller
Browse files

[SPARC]: Fix some section mismatch warnings in sparc drivers. 



Signed-off-by: default avatarBen Collins <ben.collins@ubuntu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5aee87c4

drivers/net/myri_code.h

+4 −4
Original line number Diff line number Diff line 
/* This is the Myrinet MCP code for LANai4.x */

/* Generated by  cat $MYRI_HOME/lib/lanai/mcp4.dat > myri_code4.h */



static unsigned int lanai4_code_off = 0x0000; /* half-word offset */

static unsigned char lanai4_code[76256] __initdata = {

static unsigned int __devinitdata lanai4_code_off = 0x0000; /* half-word offset */

static unsigned char __devinitdata lanai4_code[76256] = {

0xF2,0x0E,

0xFE,0x00, 0xC2,0x90, 0x00,0x00, 0x07,0x88, 0x00,0x08, 0xE0,0x01, 0x01,0x4C, 0x97,0x93,

0xFF,0xFC, 0xE0,0x00, 0x00,0x14, 0x00,0x00, 0x00,0x01, 0x00,0x00, 0x00,0x00, 0x92,0x93,
@@ -4774,8 +4774,8 @@ static unsigned char lanai4_code[76256] __initdata = { 


/* This is the LANai data */



static unsigned int lanai4_data_off = 0x94F0; /* half-word offset */

static unsigned char lanai4_data[20472] __initdata;

static unsigned int __devinitdata lanai4_data_off = 0x94F0; /* half-word offset */

static unsigned char __devinitdata lanai4_data[20472];





#ifdef SYMBOL_DEFINES_COMPILED

drivers/net/myri_sbus.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int myri_do_handshake(struct myri_eth *mp) 
	return 0;

}



static int myri_load_lanai(struct myri_eth *mp)

static int __devinit myri_load_lanai(struct myri_eth *mp)

{

	struct net_device	*dev = mp->dev;

	struct myri_shmem __iomem *shmem = mp->shmem;
@@ -891,7 +891,7 @@ static void dump_eeprom(struct myri_eth *mp) 
}

#endif



static int __init myri_ether_init(struct sbus_dev *sdev)

static int __devinit myri_ether_init(struct sbus_dev *sdev)

{

	static int num;

	static unsigned version_printed;

drivers/net/sunbmac.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#define DRV_RELDATE	"11/24/03"

#define DRV_AUTHOR	"David S. Miller (davem@redhat.com)"



static char version[] __initdata =

static char version[] =

	DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";



MODULE_VERSION(DRV_VERSION);

drivers/scsi/qlogicpti.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int qlogicpti_reset_hardware(struct Scsi_Host *host) 


#define PTI_RESET_LIMIT 400



static int __init qlogicpti_load_firmware(struct qlogicpti *qpti)

static int __devinit qlogicpti_load_firmware(struct qlogicpti *qpti)

{

	struct Scsi_Host *host = qpti->qhost;

	unsigned short csum = 0;

drivers/scsi/qlogicpti_asm.c

+2 −2
Original line number Diff line number Diff line 
/* Version 1.31.00 ISP1000 Initiator RISC firmware */

unsigned short sbus_risc_code01[] __initdata = {

unsigned short sbus_risc_code01[] __devinitdata = {

	0x0078, 0x1030, 0x0000, 0x2419, 0x0000, 0x12ff, 0x2043, 0x4f50,

	0x5952, 0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932,

	0x2c31, 0x3939, 0x332c, 0x3139, 0x3934, 0x2051, 0x4c4f, 0x4749,
@@ -1157,4 +1157,4 @@ unsigned short sbus_risc_code01[] __initdata = { 
	0x003c, 0x0040, 0x3415, 0x2019, 0x2626, 0x7b22, 0x7b26, 0x007c,

	0x92a7

};

unsigned short sbus_risc_code_length01 = 0x2419;
 
unsigned short __devinitdata sbus_risc_code_length01 = 0x2419;