diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-04-15 19:01:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-16 16:00:00 -0400 |
commit | fed9017e03f23098137716bd6010772ac1aa8a80 (patch) | |
tree | ac2e76ca65c84dbfeca758930191f86658ed1948 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 66c73db7c6f7672e40c0bb1d2689f2d0d0922aad (diff) |
iwlwifi: move HW device registration
This patch moves the HW device registration from the iwl-4965.c file, which
implies a HW specific support, to a more general location.
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 8c8d7cffccf..4a40109d4aa 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -4930,7 +4930,7 @@ static struct iwl_ops iwl4965_ops = { | |||
4930 | .utils = &iwl4965_hcmd_utils, | 4930 | .utils = &iwl4965_hcmd_utils, |
4931 | }; | 4931 | }; |
4932 | 4932 | ||
4933 | static struct iwl_cfg iwl4965_agn_cfg = { | 4933 | struct iwl_cfg iwl4965_agn_cfg = { |
4934 | .name = "4965AGN", | 4934 | .name = "4965AGN", |
4935 | .fw_name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode", | 4935 | .fw_name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode", |
4936 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, | 4936 | .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N, |
@@ -4938,14 +4938,6 @@ static struct iwl_cfg iwl4965_agn_cfg = { | |||
4938 | .mod_params = &iwl4965_mod_params, | 4938 | .mod_params = &iwl4965_mod_params, |
4939 | }; | 4939 | }; |
4940 | 4940 | ||
4941 | struct pci_device_id iwl4965_hw_card_ids[] = { | ||
4942 | {IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)}, | ||
4943 | {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)}, | ||
4944 | {0} | ||
4945 | }; | ||
4946 | |||
4947 | MODULE_DEVICE_TABLE(pci, iwl4965_hw_card_ids); | ||
4948 | |||
4949 | module_param_named(antenna, iwl4965_mod_params.antenna, int, 0444); | 4941 | module_param_named(antenna, iwl4965_mod_params.antenna, int, 0444); |
4950 | MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); | 4942 | MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); |
4951 | module_param_named(disable, iwl4965_mod_params.disable, int, 0444); | 4943 | module_param_named(disable, iwl4965_mod_params.disable, int, 0444); |