Commit 162ed082 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] Amiga Zorro8390 Ethernet section conflict

Jeff Garzik notes that the previous cleanup highlights a bug:
>
> 	static const struct card_info {
> 	    zorro_id id;
> 	    const char *name;
> 	    unsigned int offset;
> 	} cards[] __initdata = {
>
> and the lone user is __devinit:
>
> static int __devinit zorro8390_init_one(struct zorro_dev *z,
>                                        const struct zorro_device_id *ent)

Here's the fix..
parent 8aabc781
......@@ -64,7 +64,7 @@ static struct card_info {
zorro_id id;
const char *name;
unsigned int offset;
} cards[] __initdata = {
} cards[] __devinitdata = {
{ ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, "Ariadne II", 0x0600 },
{ ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, "X-Surf", 0x8600 },
};
......
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