Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf3a85be authored by Gerard Snitselaar's avatar Gerard Snitselaar Committed by Greg Kroah-Hartman
Browse files

staging: vme: fix section mismatches in linux-next 20120314



pio2_gpio_init() annotated with __init, but called by pio2_probe()
which is annotated __devinit. pio2_gpio_exit() is annotated __exit,
but is called by pio2_probe() and by pio2_remove() which is annotated
__devexit.

Signed-off-by: default avatarGerard Snitselaar <dev@snitselaar.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dec3a003
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -243,7 +243,7 @@ struct pio2_card {
int pio2_cntr_reset(struct pio2_card *);
int pio2_cntr_reset(struct pio2_card *);


int pio2_gpio_reset(struct pio2_card *);
int pio2_gpio_reset(struct pio2_card *);
int __init pio2_gpio_init(struct pio2_card *);
int __devinit pio2_gpio_init(struct pio2_card *);
void __exit pio2_gpio_exit(struct pio2_card *);
void pio2_gpio_exit(struct pio2_card *);


#endif /* _VME_PIO2_H_ */
#endif /* _VME_PIO2_H_ */
+2 −2
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ int pio2_gpio_reset(struct pio2_card *card)
	return 0;
	return 0;
}
}


int __init pio2_gpio_init(struct pio2_card *card)
int __devinit pio2_gpio_init(struct pio2_card *card)
{
{
	int retval = 0;
	int retval = 0;
	char *label;
	char *label;
@@ -220,7 +220,7 @@ int __init pio2_gpio_init(struct pio2_card *card)
	return retval;
	return retval;
};
};


void __exit pio2_gpio_exit(struct pio2_card *card)
void pio2_gpio_exit(struct pio2_card *card)
{
{
	const char *label = card->gc.label;
	const char *label = card->gc.label;