From: Rasesh Mody <rmody@xxxxxxxxxxx> Date: Tue, 4 Oct 2011 19:31:20 -0700 > drivers/net/built-in.o: In function `bfa_ioc_ct2_poweron': > (.text+0xcdc90): multiple definition of `bfa_ioc_ct2_poweron' > drivers/scsi/built-in.o:(.text+0x17f9a0): first defined here > > This patch renames bfa_ioc_ct2_poweron() to bfa_nw_ioc_ct2_poweron() to avoid > multiple definition with Brocade scsi driver. It also modifies asic specific > interface setup to allocate MSIX resources at power on in case of 1860 HW with > no asic block and warns if the asic gen is neither BFI_ASIC_GEN_CT nor > BFI_ASIC_GEN_CT2. > > Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> > Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html