diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-05 01:06:28 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-06 17:57:39 +0200 |
| commit | ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b (patch) | |
| tree | e3f91606873495ec492602ef6ec636243391654e /target/linux/brcm2708 | |
| parent | 1153773c78d39d518b592f7b77180f370bcd4a60 (diff) | |
| download | upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.tar.gz upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.tar.bz2 upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.zip | |
kernel: bump 4.14 to 4.14.235
Manually rebased
ramips/patches-5.4/0048-asoc-add-mt7620-support.patch
All others updated automatically.
Compile-tested on: ath79/generic, ramips/mt7621
Runtime-tested on: ath79/generic
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch b/target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch index 4caa4efd95..450b97ba3b 100644 --- a/target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch @@ -111,7 +111,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); -@@ -2729,6 +2736,7 @@ static int mmc_blk_probe(struct mmc_card +@@ -2741,6 +2748,7 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md, *part_md; char cap_str[10]; @@ -119,7 +119,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /* * Check that the card supports the command class(es) we need. -@@ -2736,7 +2744,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -2748,7 +2756,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -137,7 +137,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> md = mmc_blk_alloc(card); if (IS_ERR(md)) -@@ -2744,9 +2761,14 @@ static int mmc_blk_probe(struct mmc_card +@@ -2756,9 +2773,14 @@ static int mmc_blk_probe(struct mmc_card string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, cap_str, sizeof(cap_str)); |