From 164fc25500735c1ea64778604a3130caea658f43 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 21 Feb 2008 15:11:13 -0800 Subject: [PATCH] --- yaml --- r: 86458 b: refs/heads/master c: 3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 570b0893f65c..2b03506d6721 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 489815ce224e75c2fcd5ebdfaa740d7f9a4f20d3 +refs/heads/master: 3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 7824bc2993a7..fc5c63f4f578 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -3490,7 +3490,6 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state) static void e1000e_disable_l1aspm(struct pci_dev *pdev) { int pos; - u32 cap; u16 val; /* @@ -3505,7 +3504,6 @@ static void e1000e_disable_l1aspm(struct pci_dev *pdev) * active. */ pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); - pci_read_config_dword(pdev, pos + PCI_EXP_LNKCAP, &cap); pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &val); if (val & 0x2) { dev_warn(&pdev->dev, "Disabling L1 ASPM\n");