| Message ID | 1600044290-12475-1-git-send-email-tiantao6@hisilicon.com |
|---|---|
| State | Accepted |
| Commit | 759e56d9238ec0bb964965357f8bbb30ff2ec4b6 |
| Headers | show |
| Series | PNP: Fix duplicate included pci.h | expand |
On Mon, Sep 14, 2020 at 2:47 AM Tian Tao <tiantao6@hisilicon.com> wrote: > > linux/pci.h is included more than once, Remove the one that isn't > necessary. > > Signed-off-by: Tian Tao <tiantao6@hisilicon.com> > --- > drivers/pnp/quirks.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c > index de99f37..ac98b99 100644 > --- a/drivers/pnp/quirks.c > +++ b/drivers/pnp/quirks.c > @@ -226,8 +226,6 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *dev) > dev_info(&dev->dev, "made independent IRQ optional\n"); > } > > -#include <linux/pci.h> > - > static void quirk_system_pci_resources(struct pnp_dev *dev) > { > struct pci_dev *pdev = NULL; > -- Applied as 5.10 material with some subject and changelog edits, thanks!
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index de99f37..ac98b99 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c @@ -226,8 +226,6 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *dev) dev_info(&dev->dev, "made independent IRQ optional\n"); } -#include <linux/pci.h> - static void quirk_system_pci_resources(struct pnp_dev *dev) { struct pci_dev *pdev = NULL;
linux/pci.h is included more than once, Remove the one that isn't necessary. Signed-off-by: Tian Tao <tiantao6@hisilicon.com> --- drivers/pnp/quirks.c | 2 -- 1 file changed, 2 deletions(-)