| Message ID | 1427635734-24786-57-git-send-email-mst@redhat.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, 2015-03-29 at 15:41 +0200, Michael S. Tsirkin wrote: > Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, > use the new header directly so we can drop > the wrapper in include/linux/pci_ids.h. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks Michael, I will add your patch to my queue.
On Sun, 2015-03-29 at 22:30 -0700, Stephen Hemminger wrote: > Patch was rejected upstream by Greg Thanks for the update Stephen, I will drop the patch. > On Sun, Mar 29, 2015 at 4:55 PM, Jeff Kirsher > <jeffrey.t.kirsher@intel.com> wrote: > On Sun, 2015-03-29 at 15:41 +0200, Michael S. Tsirkin wrote: > > Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, > > use the new header directly so we can drop > > the wrapper in include/linux/pci_ids.h. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > --- > > drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Thanks Michael, I will add your patch to my queue. > -- > git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git > dev-queue
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c index bf9a220..8a2e3dc 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c @@ -32,7 +32,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include <linux/pci_ids.h> +#include <uapi/linux/pci_ids.h> #include "ixgb_hw.h" #include "ixgb_ids.h"
Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, use the new header directly so we can drop the wrapper in include/linux/pci_ids.h. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)