summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/iwl-pci.c
diff options
context:
space:
mode:
authorGregory Greenman <gregory.greenman@intel.com>2012-01-10 21:22:56 +0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-02-03 01:40:16 +0400
commita591697730a3c416cd384bc199eb5dde622c4c78 (patch)
treeb410d6785ba3e659de0eae1f84f9e9a4ef166444 /drivers/net/wireless/iwlwifi/iwl-pci.c
parented6a3803408f18da387463d569b4edc5078fd9aa (diff)
downloadlinux-a591697730a3c416cd384bc199eb5dde622c4c78.tar.xz
iwlwifi: Connect IDI transport to driver.
This patch connects IDI transport to driver. It does so by using a number of ifdefs at this stage. IDI is a new transport that is under development. Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-pci.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-pci.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 03702a2e913a..2c46063522c9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -454,7 +454,11 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bus->irq = pdev->irq;
bus->ops = &bus_ops_pci;
+#ifdef CONFIG_IWLWIFI_IDI
+ err = iwl_probe(bus, &trans_ops_idi, cfg);
+#else
err = iwl_probe(bus, &trans_ops_pcie, cfg);
+#endif
if (err)
goto out_disable_msi;
return 0;