summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/ix1_micro.c
diff options
context:
space:
mode:
authorKarsten Keil <kkeil@suse.de>2006-07-10 04:44:11 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 13:24:15 -0700
commit67eb5db5874076db01febed5a1a9281628fa9fb4 (patch)
tree5116e91370d700c5eb497f13a24f10203baf5caa /drivers/isdn/hisax/ix1_micro.c
parentacbf8bd738f1357e0e3b97b918bef5be272b176e (diff)
downloadblackbird-op-linux-67eb5db5874076db01febed5a1a9281628fa9fb4.tar.gz
blackbird-op-linux-67eb5db5874076db01febed5a1a9281628fa9fb4.zip
[PATCH] hisax: fix usage of __init*
Fix the warnings about the section mismatches for __init* in the HiSax driver. Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/hisax/ix1_micro.c')
-rw-r--r--drivers/isdn/hisax/ix1_micro.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 908a7e144421..39717506c678 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -210,7 +210,7 @@ ix1_card_msg(struct IsdnCardState *cs, int mt, void *arg)
}
#ifdef __ISAPNP__
-static struct isapnp_device_id itk_ids[] __initdata = {
+static struct isapnp_device_id itk_ids[] __devinitdata = {
{ ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
(unsigned long) "ITK micro 2" },
@@ -220,12 +220,12 @@ static struct isapnp_device_id itk_ids[] __initdata = {
{ 0, }
};
-static struct isapnp_device_id *ipid __initdata = &itk_ids[0];
+static struct isapnp_device_id *ipid __devinitdata = &itk_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL;
#endif
-int __init
+int __devinit
setup_ix1micro(struct IsdnCard *card)
{
struct IsdnCardState *cs = card->cs;
OpenPOWER on IntegriCloud