tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Ben Collins and committed by
David S. Miller b48194bf 5aee87c4

+10 -10
+4 -4
drivers/net/myri_code.h
··· 1 1 /* This is the Myrinet MCP code for LANai4.x */ 2 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 */ 5 - static unsigned char lanai4_code[76256] __initdata = { 4 + static unsigned int __devinitdata lanai4_code_off = 0x0000; /* half-word offset */ 5 + static unsigned char __devinitdata lanai4_code[76256] = { 6 6 0xF2,0x0E, 7 7 0xFE,0x00, 0xC2,0x90, 0x00,0x00, 0x07,0x88, 0x00,0x08, 0xE0,0x01, 0x01,0x4C, 0x97,0x93, 8 8 0xFF,0xFC, 0xE0,0x00, 0x00,0x14, 0x00,0x00, 0x00,0x01, 0x00,0x00, 0x00,0x00, 0x92,0x93, ··· 4774 4774 4775 4775 /* This is the LANai data */ 4776 4776 4777 - static unsigned int lanai4_data_off = 0x94F0; /* half-word offset */ 4778 - static unsigned char lanai4_data[20472] __initdata; 4777 + static unsigned int __devinitdata lanai4_data_off = 0x94F0; /* half-word offset */ 4778 + static unsigned char __devinitdata lanai4_data[20472]; 4779 4779 4780 4780 4781 4781 #ifdef SYMBOL_DEFINES_COMPILED
+2 -2
drivers/net/myri_sbus.c
··· 168 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 173 struct net_device *dev = mp->dev; 174 174 struct myri_shmem __iomem *shmem = mp->shmem; ··· 891 891 } 892 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 896 static int num; 897 897 static unsigned version_printed;
+1 -1
drivers/net/sunbmac.c
··· 42 42 #define DRV_RELDATE "11/24/03" 43 43 #define DRV_AUTHOR "David S. Miller (davem@redhat.com)" 44 44 45 - static char version[] __initdata = 45 + static char version[] = 46 46 DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n"; 47 47 48 48 MODULE_VERSION(DRV_VERSION);
+1 -1
drivers/scsi/qlogicpti.c
··· 461 461 462 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 466 struct Scsi_Host *host = qpti->qhost; 467 467 unsigned short csum = 0;
+2 -2
drivers/scsi/qlogicpti_asm.c
··· 1 1 /* Version 1.31.00 ISP1000 Initiator RISC firmware */ 2 - unsigned short sbus_risc_code01[] __initdata = { 2 + unsigned short sbus_risc_code01[] __devinitdata = { 3 3 0x0078, 0x1030, 0x0000, 0x2419, 0x0000, 0x12ff, 0x2043, 0x4f50, 4 4 0x5952, 0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, 5 5 0x2c31, 0x3939, 0x332c, 0x3139, 0x3934, 0x2051, 0x4c4f, 0x4749, ··· 1157 1157 0x003c, 0x0040, 0x3415, 0x2019, 0x2626, 0x7b22, 0x7b26, 0x007c, 1158 1158 0x92a7 1159 1159 }; 1160 - unsigned short sbus_risc_code_length01 = 0x2419; 1160 + unsigned short __devinitdata sbus_risc_code_length01 = 0x2419;