diff options
author | Ben Collins <ben.collins@ubuntu.com> | 2006-10-17 22:11:31 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-10-17 22:28:51 -0400 |
commit | b48194bf0dc0f8e2b617fab10df885513fbb3bad (patch) | |
tree | 4855a74db56b6b2ee28a13e667b60034e0a70550 | |
parent | 5aee87c43e3a71a4aa4e72b0dc2180e4952c0848 (diff) |
[SPARC]: Fix some section mismatch warnings in sparc drivers.
Signed-off-by: Ben Collins <ben.collins@ubuntu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/myri_code.h | 8 | ||||
-rw-r--r-- | drivers/net/myri_sbus.c | 4 | ||||
-rw-r--r-- | drivers/net/sunbmac.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qlogicpti.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qlogicpti_asm.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/myri_code.h b/drivers/net/myri_code.h index e21ec9b2c706..ba7b8652c501 100644 --- a/drivers/net/myri_code.h +++ b/drivers/net/myri_code.h | |||
@@ -1,8 +1,8 @@ | |||
1 | /* This is the Myrinet MCP code for LANai4.x */ | 1 | /* This is the Myrinet MCP code for LANai4.x */ |
2 | /* Generated by cat $MYRI_HOME/lib/lanai/mcp4.dat > myri_code4.h */ | 2 | /* Generated by cat $MYRI_HOME/lib/lanai/mcp4.dat > myri_code4.h */ |
3 | 3 | ||
4 | static unsigned int lanai4_code_off = 0x0000; /* half-word offset */ | 4 | static unsigned int __devinitdata lanai4_code_off = 0x0000; /* half-word offset */ |
5 | static unsigned char lanai4_code[76256] __initdata = { | 5 | static unsigned char __devinitdata lanai4_code[76256] = { |
6 | 0xF2,0x0E, | 6 | 0xF2,0x0E, |
7 | 0xFE,0x00, 0xC2,0x90, 0x00,0x00, 0x07,0x88, 0x00,0x08, 0xE0,0x01, 0x01,0x4C, 0x97,0x93, | 7 | 0xFE,0x00, 0xC2,0x90, 0x00,0x00, 0x07,0x88, 0x00,0x08, 0xE0,0x01, 0x01,0x4C, 0x97,0x93, |
8 | 0xFF,0xFC, 0xE0,0x00, 0x00,0x14, 0x00,0x00, 0x00,0x01, 0x00,0x00, 0x00,0x00, 0x92,0x93, | 8 | 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 = { | |||
4774 | 4774 | ||
4775 | /* This is the LANai data */ | 4775 | /* This is the LANai data */ |
4776 | 4776 | ||
4777 | static unsigned int lanai4_data_off = 0x94F0; /* half-word offset */ | 4777 | static unsigned int __devinitdata lanai4_data_off = 0x94F0; /* half-word offset */ |
4778 | static unsigned char lanai4_data[20472] __initdata; | 4778 | static unsigned char __devinitdata lanai4_data[20472]; |
4779 | 4779 | ||
4780 | 4780 | ||
4781 | #ifdef SYMBOL_DEFINES_COMPILED | 4781 | #ifdef SYMBOL_DEFINES_COMPILED |
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 466b484c9fa4..7747bfd99f91 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
@@ -168,7 +168,7 @@ static int myri_do_handshake(struct myri_eth *mp) | |||
168 | return 0; | 168 | return 0; |
169 | } | 169 | } |
170 | 170 | ||
171 | static int myri_load_lanai(struct myri_eth *mp) | 171 | static int __devinit myri_load_lanai(struct myri_eth *mp) |
172 | { | 172 | { |
173 | struct net_device *dev = mp->dev; | 173 | struct net_device *dev = mp->dev; |
174 | struct myri_shmem __iomem *shmem = mp->shmem; | 174 | struct myri_shmem __iomem *shmem = mp->shmem; |
@@ -891,7 +891,7 @@ static void dump_eeprom(struct myri_eth *mp) | |||
891 | } | 891 | } |
892 | #endif | 892 | #endif |
893 | 893 | ||
894 | static int __init myri_ether_init(struct sbus_dev *sdev) | 894 | static int __devinit myri_ether_init(struct sbus_dev *sdev) |
895 | { | 895 | { |
896 | static int num; | 896 | static int num; |
897 | static unsigned version_printed; | 897 | static unsigned version_printed; |
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 6439b0cef1e4..18f88853e1e5 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #define DRV_RELDATE "11/24/03" | 42 | #define DRV_RELDATE "11/24/03" |
43 | #define DRV_AUTHOR "David S. Miller (davem@redhat.com)" | 43 | #define DRV_AUTHOR "David S. Miller (davem@redhat.com)" |
44 | 44 | ||
45 | static char version[] __initdata = | 45 | static char version[] = |
46 | DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n"; | 46 | DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n"; |
47 | 47 | ||
48 | MODULE_VERSION(DRV_VERSION); | 48 | MODULE_VERSION(DRV_VERSION); |
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index ed58bb489889..9b827ceec501 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c | |||
@@ -461,7 +461,7 @@ static int qlogicpti_reset_hardware(struct Scsi_Host *host) | |||
461 | 461 | ||
462 | #define PTI_RESET_LIMIT 400 | 462 | #define PTI_RESET_LIMIT 400 |
463 | 463 | ||
464 | static int __init qlogicpti_load_firmware(struct qlogicpti *qpti) | 464 | static int __devinit qlogicpti_load_firmware(struct qlogicpti *qpti) |
465 | { | 465 | { |
466 | struct Scsi_Host *host = qpti->qhost; | 466 | struct Scsi_Host *host = qpti->qhost; |
467 | unsigned short csum = 0; | 467 | unsigned short csum = 0; |
diff --git a/drivers/scsi/qlogicpti_asm.c b/drivers/scsi/qlogicpti_asm.c index 1545b30681b4..19aa84f46018 100644 --- a/drivers/scsi/qlogicpti_asm.c +++ b/drivers/scsi/qlogicpti_asm.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* Version 1.31.00 ISP1000 Initiator RISC firmware */ | 1 | /* Version 1.31.00 ISP1000 Initiator RISC firmware */ |
2 | unsigned short sbus_risc_code01[] __initdata = { | 2 | unsigned short sbus_risc_code01[] __devinitdata = { |
3 | 0x0078, 0x1030, 0x0000, 0x2419, 0x0000, 0x12ff, 0x2043, 0x4f50, | 3 | 0x0078, 0x1030, 0x0000, 0x2419, 0x0000, 0x12ff, 0x2043, 0x4f50, |
4 | 0x5952, 0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, | 4 | 0x5952, 0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, |
5 | 0x2c31, 0x3939, 0x332c, 0x3139, 0x3934, 0x2051, 0x4c4f, 0x4749, | 5 | 0x2c31, 0x3939, 0x332c, 0x3139, 0x3934, 0x2051, 0x4c4f, 0x4749, |
@@ -1157,4 +1157,4 @@ unsigned short sbus_risc_code01[] __initdata = { | |||
1157 | 0x003c, 0x0040, 0x3415, 0x2019, 0x2626, 0x7b22, 0x7b26, 0x007c, | 1157 | 0x003c, 0x0040, 0x3415, 0x2019, 0x2626, 0x7b22, 0x7b26, 0x007c, |
1158 | 0x92a7 | 1158 | 0x92a7 |
1159 | }; | 1159 | }; |
1160 | unsigned short sbus_risc_code_length01 = 0x2419; | 1160 | unsigned short __devinitdata sbus_risc_code_length01 = 0x2419; |