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

Commit 67eb5db5 authored by Karsten Keil's avatar Karsten Keil Committed by Linus Torvalds
Browse files

[PATCH] hisax: fix usage of __init* 



Fix the warnings about the section mismatches for __init* in the HiSax
driver.

Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent acbf8bd7

drivers/isdn/hisax/asuscom.c

+3 −3
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ Asus_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
}



#ifdef __ISAPNP__

static struct isapnp_device_id asus_ids[] __initdata = {

static struct isapnp_device_id asus_ids[] __devinitdata = {

	{ ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688),

	  ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688), 

	  (unsigned long) "Asus1688 PnP" },
@@ -313,11 +313,11 @@ static struct isapnp_device_id asus_ids[] __initdata = { 
	{ 0, }

};



static struct isapnp_device_id *ipid __initdata = &asus_ids[0];

static struct isapnp_device_id *ipid __devinitdata = &asus_ids[0];

static struct pnp_card *pnp_c __devinitdata = NULL;

#endif



int __init

int __devinit

setup_asuscom(struct IsdnCard *card)

{

	int bytecnt;

drivers/isdn/hisax/avm_a1.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
	return(0);

}



int __init

int __devinit

setup_avm_a1(struct IsdnCard *card)

{

	u_char val;

drivers/isdn/hisax/avm_pci.c

+4 −4
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ clear_pending_hdlc_ints(struct IsdnCardState *cs) 
}

#endif  /*  0  */



static void __init

static void

inithdlc(struct IsdnCardState *cs)

{

	cs->bcs[0].BC_SetStack = setstack_hdlc;
@@ -727,13 +727,13 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
}



#ifdef CONFIG_PCI

static struct pci_dev *dev_avm __initdata = NULL;

static struct pci_dev *dev_avm __devinitdata = NULL;

#endif

#ifdef __ISAPNP__

static struct pnp_card *pnp_avm_c __initdata = NULL;

static struct pnp_card *pnp_avm_c __devinitdata = NULL;

#endif



int __init

int __devinit

setup_avm_pcipnp(struct IsdnCard *card)

{

	u_int val, ver;

drivers/isdn/hisax/bkm_a4t.c

+2 −2
Original line number Diff line number Diff line
@@ -255,9 +255,9 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
	return (0);

}



static struct pci_dev *dev_a4t __initdata = NULL;

static struct pci_dev *dev_a4t __devinitdata = NULL;



int __init

int __devinit

setup_bkm_a4t(struct IsdnCard *card)

{

	struct IsdnCardState *cs = card->cs;

drivers/isdn/hisax/bkm_a8.c

+8 −8
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
	return (0);

}



static int __init

static int __devinit

sct_alloc_io(u_int adr, u_int len)

{

	if (!request_region(adr, len, "scitel")) {
@@ -272,16 +272,16 @@ sct_alloc_io(u_int adr, u_int len) 
	return(0);

}



static struct pci_dev *dev_a8 __initdata = NULL;

static u16  sub_vendor_id __initdata = 0;

static u16  sub_sys_id __initdata = 0;

static u_char pci_bus __initdata = 0;

static u_char pci_device_fn __initdata = 0;

static u_char pci_irq __initdata = 0;

static struct pci_dev *dev_a8 __devinitdata = NULL;

static u16  sub_vendor_id __devinitdata = 0;

static u16  sub_sys_id __devinitdata = 0;

static u_char pci_bus __devinitdata = 0;

static u_char pci_device_fn __devinitdata = 0;

static u_char pci_irq __devinitdata = 0;



#endif /* CONFIG_PCI */



int __init

int __devinit

setup_sct_quadro(struct IsdnCard *card)

{

#ifdef CONFIG_PCI