diff options
| author | John Crispin <john@openwrt.org> | 2015-12-23 18:25:22 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-12-23 18:25:22 +0000 |
| commit | c01ca020ea12190afa644bd80629cc11f380e24e (patch) | |
| tree | 53082bdeb11dd17c0e9ab5e5976bc6b468d68093 | |
| parent | 11115d8e2c420b720fa97b0698bc679e5933889d (diff) | |
| download | upstream-c01ca020ea12190afa644bd80629cc11f380e24e.tar.gz upstream-c01ca020ea12190afa644bd80629cc11f380e24e.tar.bz2 upstream-c01ca020ea12190afa644bd80629cc11f380e24e.zip | |
lantiq: fix PCI_DEVICE_ID_LANTIQ_PCIE
It's not necessary to define PCI_* if pci_ids.h is included a few
lines above.
The change to pci_ids.h doesn't look intentional to me, especially
since the former value is added to the top of ifxmips_fixup_pcie.c.
Both changes were introduced with the kernel 4.1 support patches and
were not present in the 3.18 patches.
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
SVN-Revision: 47996
| -rw-r--r-- | target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch index e65e9826b8..1b78acd0d8 100644 --- a/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch @@ -89,7 +89,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o --- /dev/null +++ b/arch/mips/pci/fixup-lantiq-pcie.c -@@ -0,0 +1,82 @@ +@@ -0,0 +1,74 @@ +/****************************************************************************** +** +** FILE NAME : ifxmips_fixup_pcie.c @@ -124,14 +124,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + +#include "pcie-lantiq.h" + -+#define PCI_VENDOR_ID_INFINEON 0x15D1 -+#define PCI_DEVICE_ID_INFINEON_DANUBE 0x000F -+#define PCI_DEVICE_ID_INFINEON_PCIE 0x0011 -+#define PCI_VENDOR_ID_LANTIQ 0x1BEF -+#define PCI_DEVICE_ID_LANTIQ_PCIE 0x0011 -+ -+ -+ +static void +ifx_pcie_fixup_resource(struct pci_dev *dev) +{ @@ -5533,7 +5525,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +#define PCI_DEVICE_ID_INFINEON_DANUBE 0x000F +#define PCI_DEVICE_ID_INFINEON_PCIE 0x0011 +#define PCI_VENDOR_ID_LANTIQ 0x1BEF -+#define PCI_DEVICE_ID_LANTIQ_PCIE 0x00 ++#define PCI_DEVICE_ID_LANTIQ_PCIE 0x0011 + #define PCI_VENDOR_ID_WINBOND 0x10ad #define PCI_DEVICE_ID_WINBOND_82C105 0x0105 |