Skip to content

Commit 627dc57

Browse files
misaka36desmondc9
authored andcommitted
kernel: bump 5.15 to 5.15.74 (coolsnowwolf#10263)
All patches automatically rebased. Signed-off-by: Liu Linhui <[email protected]>
1 parent 274a272 commit 627dc57

File tree

2 files changed

+23
-16
lines changed

2 files changed

+23
-16
lines changed

include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .72
2-
LINUX_KERNEL_HASH-5.15.72 = 6090323b5b471ae9d3bbc0058966113609f5bbd22fa19a76df32a8abc52f07ab
1+
LINUX_VERSION-5.15 = .74
2+
LINUX_KERNEL_HASH-5.15.74 = 2c1539a2f85b835c36c4a07c8270b52b0bec38fdda7339477d07f0c3af8c4265
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1-
--- a/drivers/staging/Kconfig
2-
+++ b/drivers/staging/Kconfig
3-
@@ -40,2 +40,4 @@
4-
5-
+source "drivers/staging/rts5139/Kconfig"
6-
+
7-
source "drivers/staging/rts5208/Kconfig"
8-
9-
--- a/drivers/staging/Makefile
10-
+++ b/drivers/staging/Makefile
11-
@@ -11,2 +11,3 @@
12-
obj-$(CONFIG_R8188EU) += r8188eu/
13-
+obj-$(CONFIG_RTS5139) += rts5139/
14-
obj-$(CONFIG_RTS5208) += rts5208/
1+
--- a/drivers/staging/Kconfig
2+
+++ b/drivers/staging/Kconfig
3+
@@ -38,6 +38,8 @@ source "drivers/staging/rtl8712/Kconfig"
4+
5+
source "drivers/staging/r8188eu/Kconfig"
6+
7+
+source "drivers/staging/rts5139/Kconfig"
8+
+
9+
source "drivers/staging/rts5208/Kconfig"
10+
11+
source "drivers/staging/octeon/Kconfig"
12+
--- a/drivers/staging/Makefile
13+
+++ b/drivers/staging/Makefile
14+
@@ -9,6 +9,7 @@ obj-$(CONFIG_RTL8192E) += rtl8192e/
15+
obj-$(CONFIG_RTL8723BS) += rtl8723bs/
16+
obj-$(CONFIG_R8712U) += rtl8712/
17+
obj-$(CONFIG_R8188EU) += r8188eu/
18+
+obj-$(CONFIG_RTS5139) += rts5139/
19+
obj-$(CONFIG_RTS5208) += rts5208/
20+
obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/
21+
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/

0 commit comments

Comments
 (0)