projects
/
openwrt
/
staging
/
blogic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lantiq: make patches apply
[openwrt/staging/blogic.git]
/
target
/
linux
/
lantiq
/
patches-4.19
/
0001-MIPS-lantiq-add-pcie-driver.patch
diff --git
a/target/linux/lantiq/patches-4.19/0001-MIPS-lantiq-add-pcie-driver.patch
b/target/linux/lantiq/patches-4.19/0001-MIPS-lantiq-add-pcie-driver.patch
index 48dd111cca3c32c646bcd5b87da8c8d532caf058..4cea5547c2eb38c2052dae260befb36c3ed5941e 100644
(file)
--- a/
target/linux/lantiq/patches-4.19/0001-MIPS-lantiq-add-pcie-driver.patch
+++ b/
target/linux/lantiq/patches-4.19/0001-MIPS-lantiq-add-pcie-driver.patch
@@
-4143,7
+4143,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
+
--- a/arch/mips/pci/pci-legacy.c
+++ b/arch/mips/pci/pci-legacy.c
+
--- a/arch/mips/pci/pci-legacy.c
+++ b/arch/mips/pci/pci-legacy.c
-@@ -31
3,3 +313
,30 @@ char *__init pcibios_setup(char *str)
+@@ -31
1,3 +311
,30 @@ char *__init pcibios_setup(char *str)
return pcibios_plat_setup(str);
return str;
}
return pcibios_plat_setup(str);
return str;
}
@@
-5482,9
+5482,9
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
+
+#endif /* IFXMIPS_PCIE_VR9_H */
+
+
+#endif /* IFXMIPS_PCIE_VR9_H */
+
---- a/drivers/pci/pcie/
aer/
Kconfig
-+++ b/drivers/pci/pcie/
aer/
Kconfig
-@@ -
19,6 +19,7 @@ config PCIEAER
+--- a/drivers/pci/pcie/Kconfig
++++ b/drivers/pci/pcie/Kconfig
+@@ -
54,6 +54,7 @@ config PCIEAER_INJECT
config PCIE_ECRC
bool "PCI Express ECRC settings control"
depends on PCIEAER
config PCIE_ECRC
bool "PCI Express ECRC settings control"
depends on PCIEAER
@@
-5494,7
+5494,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
(transaction layer end-to-end CRC checking).
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
(transaction layer end-to-end CRC checking).
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
-@@ -13
02,6 +1302
,8 @@ void pci_walk_bus(struct pci_bus *top, i
+@@ -13
25,6 +1325
,8 @@ void pci_walk_bus(struct pci_bus *top, i
void *userdata);
int pci_cfg_space_size(struct pci_dev *dev);
unsigned char pci_bus_max_busnr(struct pci_bus *bus);
void *userdata);
int pci_cfg_space_size(struct pci_dev *dev);
unsigned char pci_bus_max_busnr(struct pci_bus *bus);
@@
-5505,7
+5505,7
@@
Signed-off-by: John Crispin <blogic@openwrt.org>
unsigned long type);
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
unsigned long type);
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
-@@ -106
1,6 +1061
,12 @@
+@@ -106
5,6 +1065
,12 @@
#define PCI_DEVICE_ID_SGI_LITHIUM 0x1002
#define PCI_DEVICE_ID_SGI_IOC4 0x100a
#define PCI_DEVICE_ID_SGI_LITHIUM 0x1002
#define PCI_DEVICE_ID_SGI_IOC4 0x100a