Commit baacac11 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] 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
Signed-off-by: default avatarRandy Dunlap <rddunlap@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6fb185bc
...@@ -2470,7 +2470,7 @@ MODULE_LICENSE("GPL"); ...@@ -2470,7 +2470,7 @@ MODULE_LICENSE("GPL");
static struct initvol { static struct initvol {
int mixch; int mixch;
int vol; int vol;
} initvol[] __initdata = { } initvol[] __devinitdata = {
{ SOUND_MIXER_WRITE_RECLEV, 0x4040 }, { SOUND_MIXER_WRITE_RECLEV, 0x4040 },
{ SOUND_MIXER_WRITE_LINE1, 0x4040 }, { SOUND_MIXER_WRITE_LINE1, 0x4040 },
{ SOUND_MIXER_WRITE_CD, 0x4040 }, { SOUND_MIXER_WRITE_CD, 0x4040 },
...@@ -2487,7 +2487,7 @@ static struct initvol { ...@@ -2487,7 +2487,7 @@ static struct initvol {
static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid) 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; struct sv_state *s;
mm_segment_t fs; mm_segment_t fs;
int i, val, ret; int i, val, ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment