The patches introduced in commitmaster20e68f6d39
("ar71xx: kernel: enable PCI on QCA9556 SoC") have non standard format. In unified diff format, the unchanged, contextual lines must be preceded by a space character. Refresh the patches with quilt to fix them. Fixes:20e68f6d39
("ar71xx: kernel: enable PCI on QCA9556 SoC") Signed-off-by: Gabor Juhos <juhosg@freemail.hu>
parent
bc178f6b15
commit
508999d366
@ -1,12 +1,12 @@ |
|||||||
--- a/arch/mips/ath79/pci.c
|
--- a/arch/mips/ath79/pci.c
|
||||||
+++ b/arch/mips/ath79/pci.c
|
+++ b/arch/mips/ath79/pci.c
|
||||||
@@ -324,7 +324,8 @@ int __init ath79_register_pci(void)
|
@@ -324,7 +324,8 @@ int __init ath79_register_pci(void)
|
||||||
QCA953X_PCI_MEM_SIZE,
|
QCA953X_PCI_MEM_SIZE,
|
||||||
0,
|
0,
|
||||||
ATH79_IP2_IRQ(0));
|
ATH79_IP2_IRQ(0));
|
||||||
- } else if (soc_is_qca9558()) {
|
- } else if (soc_is_qca9558()) {
|
||||||
+ } else if (soc_is_qca9558() ||
|
+ } else if (soc_is_qca9558() ||
|
||||||
+ soc_is_qca9556()) {
|
+ soc_is_qca9556()) {
|
||||||
pdev = ath79_register_pci_ar724x(0,
|
pdev = ath79_register_pci_ar724x(0,
|
||||||
QCA955X_PCI_CFG_BASE0,
|
QCA955X_PCI_CFG_BASE0,
|
||||||
QCA955X_PCI_CTRL_BASE0,
|
QCA955X_PCI_CTRL_BASE0,
|
||||||
|
@ -1,12 +1,12 @@ |
|||||||
--- a/arch/mips/ath79/pci.c
|
--- a/arch/mips/ath79/pci.c
|
||||||
+++ b/arch/mips/ath79/pci.c
|
+++ b/arch/mips/ath79/pci.c
|
||||||
@@ -324,7 +324,8 @@ int __init ath79_register_pci(void)
|
@@ -324,7 +324,8 @@ int __init ath79_register_pci(void)
|
||||||
QCA953X_PCI_MEM_SIZE,
|
QCA953X_PCI_MEM_SIZE,
|
||||||
0,
|
0,
|
||||||
ATH79_IP2_IRQ(0));
|
ATH79_IP2_IRQ(0));
|
||||||
- } else if (soc_is_qca9558()) {
|
- } else if (soc_is_qca9558()) {
|
||||||
+ } else if (soc_is_qca9558() ||
|
+ } else if (soc_is_qca9558() ||
|
||||||
+ soc_is_qca9556()) {
|
+ soc_is_qca9556()) {
|
||||||
pdev = ath79_register_pci_ar724x(0,
|
pdev = ath79_register_pci_ar724x(0,
|
||||||
QCA955X_PCI_CFG_BASE0,
|
QCA955X_PCI_CFG_BASE0,
|
||||||
QCA955X_PCI_CTRL_BASE0,
|
QCA955X_PCI_CTRL_BASE0,
|
||||||
|
Loading…
Reference in new issue