diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-08-16 13:56:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-16 13:56:01 -0700 |
| commit | 5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc (patch) | |
| tree | ed4f35d48b2859d7ced04c9f8e0f4f6b3ac0f603 /drivers/net/wireless/ipw2x00/ipw2100.c | |
| parent | Revert "netlink: netlink_recvmsg() fix" (diff) | |
| parent | ath5k: disable ASPM L0s for all cards (diff) | |
| download | linux-dev-5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc.tar.xz linux-dev-5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 16bbfa3189a5..1189dbb6e2a6 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -6665,12 +6665,13 @@ static int __init ipw2100_init(void) printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION); printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT); + pm_qos_add_request(&ipw2100_pm_qos_req, PM_QOS_CPU_DMA_LATENCY, + PM_QOS_DEFAULT_VALUE); + ret = pci_register_driver(&ipw2100_pci_driver); if (ret) goto out; - pm_qos_add_request(&ipw2100_pm_qos_req, PM_QOS_CPU_DMA_LATENCY, - PM_QOS_DEFAULT_VALUE); #ifdef CONFIG_IPW2100_DEBUG ipw2100_debug_level = debug; ret = driver_create_file(&ipw2100_pci_driver.driver, |