diff options
| author | Jens Rehsack <sno@netbsd.org> | 2020-07-09 17:26:37 +0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2020-07-09 13:33:26 -0300 |
| commit | 901b192ff8652236607f423386aee496e3ae2730 (patch) | |
| tree | 9c15a3ed5c37b974d6484f051ce57c29c3c20ab2 | |
| parent | 0f3947982905745f053c72ea9aa678b1737c468a (diff) | |
| download | meta-freescale-901b192ff8652236607f423386aee496e3ae2730.tar.gz | |
linux-fslc-qoriq: fix merge error
Fix merge error introduced while fixing conflict merging 5.4.48:
d1a00c9bb1c7 dpaa2-eth: fix return codes used in ndo_setup_tc
Signed-off-by: Jens Rehsack <sno@netbsd.org>
| -rw-r--r-- | recipes-kernel/linux/linux-fslc-qoriq_5.4.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb index df15a215..3ce5c1b6 100644 --- a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb | |||
| @@ -13,5 +13,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | |||
| 13 | LINUX_VERSION = "5.4.51" | 13 | LINUX_VERSION = "5.4.51" |
| 14 | 14 | ||
| 15 | SRCBRANCH = "5.4.y+qoriq+fslc" | 15 | SRCBRANCH = "5.4.y+qoriq+fslc" |
| 16 | SRCREV = "8221fcf6c01e7ed451510e2792c9f45422a4ca8c" | 16 | SRCREV = "c34b53c0927fcefcdea3be16cc1fb9fdcbedbe40" |
| 17 | SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH}" | 17 | SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH}" |