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

Commit 25f66630 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits)
  [NET_SCHED] sch_htb: htb_requeue fix
  [IPV6]: Replace using the magic constant "1024" with IP6_RT_PRIO_USER for fc_metric.
  starfire: secton fix
  via-velocity: section fix
  natsemi: section fix
  typhoon: section fix
  isdn: fix section mismatch warning for ISACVer
  isdn: fix section mismatch warnings from hisax_cs_setup_card
  isdn: fix section mismatch warnings in isac.c and isar.c
  isdn: fix section mismatch warning in hfc_sx.c
  [PKT_SCHED] ematch: tcf_em_destroy robustness
  [PKT_SCHED]: deinline functions in meta match
  [SCTP]: Convert sctp_dbg_objcnt to seq files.
  [SCTP]: Use snmp_fold_field instead of a homebrew analogue.
  [IGMP]: Optimize kfree_skb in igmp_rcv.
  [KEY]: Convert net/pfkey to use seq files.
  [KEY]: Clean up proc files creation a bit.
  pppol2tp: fix printk warnings
  bnx2: section fix
  bnx2x: section fix
  ...
parents 0b6ca82a 21347456

drivers/isdn/hisax/avm_a1p.c

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

}



int

setup_avm_a1_pcmcia(struct IsdnCard *card)

int __devinit setup_avm_a1_pcmcia(struct IsdnCard *card)

{

	u_char model, vers;

	struct IsdnCardState *cs = card->cs;

drivers/isdn/hisax/config.c

+5 −2
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static int init_card(struct IsdnCardState *cs) 
	return 3;

}



static int hisax_cs_setup_card(struct IsdnCard *card)

static int __devinit hisax_cs_setup_card(struct IsdnCard *card)

{

	int ret;
@@ -1166,7 +1166,10 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card, 
	return 0;

}



static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner)

/* Used from an exported function but calls __devinit functions.

 * Tell modpost not to warn (__ref)

 */

static int __ref checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner)

{

	int ret;

	struct IsdnCard *card = cards + cardnr;

drivers/isdn/hisax/hfc_sx.c

+1 −2
Original line number Diff line number Diff line
@@ -1330,8 +1330,7 @@ hfcsx_bh(struct work_struct *work) 
/********************************/

/* called for card init message */

/********************************/

static void __devinit

inithfcsx(struct IsdnCardState *cs)

static void inithfcsx(struct IsdnCardState *cs)

{

	cs->setstack_d = setstack_hfcsx;

	cs->BC_Send_Data = &hfcsx_send_data;

drivers/isdn/hisax/isac.c

+3 −6
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ static char *ISACVer[] __devinitdata = 
{"2086/2186 V1.1", "2085 B1", "2085 B2",

 "2085 V2.3"};



void

ISACVersion(struct IsdnCardState *cs, char *s)

void __devinit ISACVersion(struct IsdnCardState *cs, char *s)

{

	int val;
@@ -616,8 +615,7 @@ dbusy_timer_handler(struct IsdnCardState *cs) 
	}

}



void __devinit

initisac(struct IsdnCardState *cs)

void initisac(struct IsdnCardState *cs)

{

	cs->setstack_d = setstack_isac;

	cs->DC_Close = DC_Close_isac;
@@ -648,8 +646,7 @@ initisac(struct IsdnCardState *cs) 
	cs->writeisac(cs, ISAC_MASK, 0x0);

}



void __devinit

clear_pending_isac_ints(struct IsdnCardState *cs)

void clear_pending_isac_ints(struct IsdnCardState *cs)

{

	int val, eval;

drivers/isdn/hisax/isar.c

+1 −2
Original line number Diff line number Diff line
@@ -1894,8 +1894,7 @@ isar_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) { 
	return(0);

}



void __devinit

initisar(struct IsdnCardState *cs)

void initisar(struct IsdnCardState *cs)

{

	cs->bcs[0].BC_SetStack = setstack_isar;

	cs->bcs[1].BC_SetStack = setstack_isar;