Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (b508998f) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/wireless/hostap/hostap_pci.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -330,6 +330,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,

		dev->irq = pdev->irq;
		hw_priv->mem_start = mem;
		dev->base_addr = (unsigned long) mem;

		prism2_pci_cor_sreset(local);

+5 −5

Original line number	Diff line number	Diff line
		@@ -853,6 +853,11 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
		BIT(NL80211_IFTYPE_MESH_POINT) \|
		BIT(NL80211_IFTYPE_WDS);

		/*
		* Initialize configuration work.
		*/
		INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);

		/*
		* Let the driver probe the device to detect the capabilities.
		*/
		@@ -862,11 +867,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
		goto exit;
		}

		/*
		* Initialize configuration work.
		*/
		INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);

		/*
		* Allocate queue array.
		*/