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

Commit 36099365 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/rtlwifi/pci.c
	include/linux/netlink.h
parents 22c8c934 f70490e6

drivers/bcma/bcma_private.h

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
struct bcma_bus;



/* main.c */

extern int bcma_bus_register(struct bcma_bus *bus);

extern void bcma_bus_unregister(struct bcma_bus *bus);

int bcma_bus_register(struct bcma_bus *bus);

void bcma_bus_unregister(struct bcma_bus *bus);



/* scan.c */

int bcma_bus_scan(struct bcma_bus *bus);

drivers/bcma/core.c

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ bool bcma_core_is_enabled(struct bcma_device *core) 
}

EXPORT_SYMBOL_GPL(bcma_core_is_enabled);



static void bcma_core_disable(struct bcma_device *core, u32 flags)

void bcma_core_disable(struct bcma_device *core, u32 flags)

{

	if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)

		return;
@@ -31,6 +31,7 @@ static void bcma_core_disable(struct bcma_device *core, u32 flags) 
	bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);

	udelay(1);

}

EXPORT_SYMBOL_GPL(bcma_core_disable);



int bcma_core_enable(struct bcma_device *core, u32 flags)

{

drivers/bcma/driver_chipcommon_pmu.c

+5 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc) 
		max_msk = 0xFFFF;

		break;

	case 43224:

	case 43225:

		break;

	default:

		pr_err("PMU resource config unknown for device 0x%04X\n",
@@ -74,6 +75,7 @@ void bcma_pmu_swreg_init(struct bcma_drv_cc *cc) 
	case 0x4313:

	case 0x4331:

	case 43224:

	case 43225:

		break;

	default:

		pr_err("PMU switch/regulators init unknown for device "
@@ -96,11 +98,13 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc) 
		if (bus->chipinfo.rev == 0) {

			pr_err("Workarounds for 43224 rev 0 not fully "

				"implemented\n");

			bcma_chipco_chipctl_maskset(cc, 0, ~0, 0xF0);

			bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x00F000F0);

		} else {

			bcma_chipco_chipctl_maskset(cc, 0, ~0, 0xF0);

		}

		break;

	case 43225:

		break;

	default:

		pr_err("Workarounds unknown for device 0x%04X\n",

			bus->chipinfo.id);

drivers/bcma/driver_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -184,3 +184,4 @@ int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core, 
out:

	return err;

}

EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ 0, },

};