aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-20 10:43:09 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-20 13:03:23 +0200
commit548182bc6d38a3817c8e9f5b11207043a31c59b9 (patch)
tree47925b7011e6f85ccac7ce7eb6fae55423778248 /target/linux/adm5120
parent1f7ce19df292dfe3c270091ac0f7edc5bb9a8324 (diff)
downloadupstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.gz
upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.bz2
upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.zip
kernel: bump 3.18 to 3.18.119
Refreshed all patches. Compile-tested on: adm5120, adm8668, au1000, mcs814x, ppc40x, ppc44x, xburst Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/adm5120')
-rw-r--r--target/linux/adm5120/patches-3.18/007-adm5120_pci.patch2
-rw-r--r--target/linux/adm5120/patches-3.18/101-cfi_fixup_macronix_bootloc.patch2
-rw-r--r--target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/adm5120/patches-3.18/007-adm5120_pci.patch b/target/linux/adm5120/patches-3.18/007-adm5120_pci.patch
index a5a0abf43b..7a84217bee 100644
--- a/target/linux/adm5120/patches-3.18/007-adm5120_pci.patch
+++ b/target/linux/adm5120/patches-3.18/007-adm5120_pci.patch
@@ -10,7 +10,7 @@
obj-$(CONFIG_PCI_AR724X) += pci-ar724x.o
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
-@@ -1820,6 +1820,9 @@
+@@ -1821,6 +1821,9 @@
#define PCI_VENDOR_ID_CB 0x1307 /* Measurement Computing */
diff --git a/target/linux/adm5120/patches-3.18/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-3.18/101-cfi_fixup_macronix_bootloc.patch
index a0caa680bc..92937fce14 100644
--- a/target/linux/adm5120/patches-3.18/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches-3.18/101-cfi_fixup_macronix_bootloc.patch
@@ -67,7 +67,7 @@
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
-@@ -188,6 +188,14 @@ config MTD_CFI_AMDSTD
+@@ -189,6 +189,14 @@ config MTD_CFI_AMDSTD
provides support for command set 0002, used on chips including
the AMD Am29LV320.
diff --git a/target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch b/target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch
index c5d4d3a57e..5390bd95b7 100644
--- a/target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch
+++ b/target/linux/adm5120/patches-3.18/120-rb153_cf_driver.patch
@@ -10,7 +10,7 @@
obj-$(CONFIG_PATA_SAMSUNG_CF) += pata_samsung_cf.o
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
-@@ -955,6 +955,15 @@ config PATA_QDI
+@@ -958,6 +958,15 @@ config PATA_QDI
help
Support for QDI 6500 and 6580 PATA controllers on VESA local bus.