Skip to contentSkip to conversation

fix section type conflict in sound/isa/sscape.c

PATCH In review Adrian Bunk 2 participants 2 messages Jul 13, 2003 – Jul 17, 2003 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix section type conflict in sound/isa/sscape.c

When compiling 2.5.75-mm1 with !CONFIG_HOTPLUG using gcc 3.3 I got the following compile error (but it doesn't seem to be specific to -mm):

<-- snip -->

...
CC sound/isa/sscape.o
sound/isa/sscape.c: In function `get_irq_config':
sound/isa/sscape.c:812: error: valid_irq causes a section type conflict make[2]: *** [sound/isa/sscape.o] Error 1
make[1]: *** [sound/isa] Error 2
make: *** [sound] Error 2

<-- snip -->

The following patch fixes the problem:

sound/isa/sscape.c renamed from sound/isa/sscape.c.old +1 -1
@@ -809,7 +809,7 @@
  */
 static unsigned __devinit get_irq_config(int irq)
 {
-	static const int valid_irq[] __devinitdata = { 9, 5, 7, 10 };
+	static const int valid_irq[] = { 9, 5, 7, 10 };
 	unsigned cfg;
 
 	for (cfg = 0; cfg < ARRAY_SIZE(valid_irq); ++cfg) {

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#1 lore raw

In message <[email protected]> you write:

sound/isa/sscape.c line 813

Quoted 9 lines
sound/isa/sscape.c renamed from sound/isa/sscape.c.old +1 -1
@@ -809,7 +809,7 @@
  */
 static unsigned __devinit get_irq_config(int irq)
 {
-	static const int valid_irq[] __devinitdata = { 9, 5, 7, 10 };
+	static const int valid_irq[] = { 9, 5, 7, 10 };
 	unsigned cfg;

Just remove the static.

Rusty.
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.