Skip to contentSkip to conversation

sonicvibes: fix initdata references

PATCH New Randy.Dunlap 1 participant 1 message Feb 28, 2005 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sonicvibes: fix initdata references

sonicvibes: _devinit function was referencing __initdata (2x), which should be __devinitdata;

Error: ./sound/oss/sonicvibes.o .text refers to 0000000000003ca7 R_X86_64_32S .init.data+0x0000000000000080 Error: ./sound/oss/sonicvibes.o .text refers to 00000000000043eb R_X86_64_32S .init.data+0x0000000000000024 Error: ./sound/oss/sonicvibes.o .text refers to 00000000000043f2 R_X86_64_32S .init.data+0x0000000000000020

diffstat:=

 sound/oss/sonicvibes.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/oss/sonicvibes.c renamed from sound/oss/sonicvibes.c~sonicvibes_sections +2 -2
diff -Naurp ./sound/oss/sonicvibes.c~sonicvibes_sections ./sound/oss/sonicvibes.c
@@ -2470,7 +2470,7 @@ MODULE_LICENSE("GPL");
 static struct initvol {
 	int mixch;
 	int vol;
-} initvol[] __initdata = {
+} initvol[] __devinitdata = {
 	{ SOUND_MIXER_WRITE_RECLEV, 0x4040 },
 	{ SOUND_MIXER_WRITE_LINE1, 0x4040 },
 	{ SOUND_MIXER_WRITE_CD, 0x4040 },
@@ -2487,7 +2487,7 @@ static struct initvol {
 
 static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid)
 {
-	static char __initdata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller";
+	static char __devinitdata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller";
        	struct sv_state *s;
 	mm_segment_t fs;
 	int i, val, ret;

---