|
51034 | 51034 | drivers/custom/hid-tmff2 | 1 + |
51035 | 51035 | drivers/custom/kvfm | 1 + |
51036 | 51036 | drivers/custom/lg4ff | 1 + |
51037 | | - drivers/custom/modprobe.conf | 1 + |
| 51037 | + drivers/custom/modprobe.conf | 8 + |
51038 | 51038 | drivers/custom/modules-load.conf | 4 + |
51039 | 51039 | drivers/custom/nct6687d | 1 + |
51040 | 51040 | drivers/custom/netmanager.conf | 15 ++ |
|
51050 | 51050 | tools/objtool/builtin-check.c | 1 + |
51051 | 51051 | tools/objtool/check.c | 3 + |
51052 | 51052 | tools/objtool/include/objtool/builtin.h | 1 + |
51053 | | - 35 files changed, 534 insertions(+), 2 deletions(-) |
| 51053 | + 35 files changed, 541 insertions(+), 2 deletions(-) |
51054 | 51054 | create mode 100644 .gitmodules |
51055 | 51055 | create mode 100644 drivers/custom/.gitignore |
51056 | 51056 | create mode 100644 drivers/custom/Kconfig |
@@ -51461,11 +51461,18 @@ index 000000000000..2092db19f7b4 |
51461 | 51461 | +Subproject commit 2092db19f7b40854e0427a1b2e39eda9f8d0c3cd |
51462 | 51462 | diff --git a/drivers/custom/modprobe.conf b/drivers/custom/modprobe.conf |
51463 | 51463 | new file mode 100644 |
51464 | | -index 000000000000..6eccdca1d8a5 |
| 51464 | +index 000000000000..dec71c4e4c15 |
51465 | 51465 | --- /dev/null |
51466 | 51466 | +++ b/drivers/custom/modprobe.conf |
51467 | | -@@ -0,0 +1 @@ |
| 51467 | +@@ -0,0 +1,8 @@ |
51468 | 51468 | +options v4l2loopback exclusive_caps=1 card_label="OBS Virtual Camera" |
| 51469 | ++ |
| 51470 | ++### These modules must be blacklisted for use with broadcom-wl |
| 51471 | ++blacklist ssb |
| 51472 | ++blacklist bcma |
| 51473 | ++blacklist b43 |
| 51474 | ++blacklist brcmsmac |
| 51475 | ++blacklist brcmfmac |
51469 | 51476 | \ No newline at end of file |
51470 | 51477 | diff --git a/drivers/custom/modules-load.conf b/drivers/custom/modules-load.conf |
51471 | 51478 | new file mode 100644 |
|
0 commit comments