]> git.hungrycats.org Git - linux/commitdiff
[PATCH] sonicvibes: fix initdata references
authorRandy Dunlap <rddunlap@osdl.org>
Mon, 28 Feb 2005 02:32:33 +0000 (18:32 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 28 Feb 2005 02:32:33 +0000 (18:32 -0800)
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

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
sound/oss/sonicvibes.c

index 432bf4965b41384b6aed80771cd7c88c75d275f3..3b3c70fcb12dab1dbe2354e0309138ce167ee4e7 100644 (file)
@@ -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;