diff options
| author | Lucas Wei <lucaswei@google.com> | 2022-10-20 22:11:36 +0800 |
|---|---|---|
| committer | Lucas Wei <lucaswei@google.com> | 2022-10-20 22:11:36 +0800 |
| commit | 8589a5f2e88195f368edea8aad1cc98c1e64a6c4 (patch) | |
| tree | 306ca004b07ed885b045cddf96d5655c48b0827b | |
| parent | c21eb0706ecef320227bec402768ef2d9ed71fa8 (diff) | |
| parent | 546cee2b2df695b13162e5f4580268bed7d9f104 (diff) | |
| download | bcm4389-8589a5f2e88195f368edea8aad1cc98c1e64a6c4.tar.gz | |
Merge android13-gs-pixel-5.10-gs101-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr2
Conflicts:
Kbuild
Bug: 238399460
Change-Id: I2fb0dc9d2e244d876c2476c68350952218615dc0
Signed-off-by: Lucas Wei <lucaswei@google.com>
| -rw-r--r-- | Kbuild | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -384,9 +384,9 @@ DHDCFLAGS += -DWL_P2P_RAND #Custom Mapping of DSCP to User Priority DHDCFLAGS += -DWL_CUSTOM_MAPPING_OF_DSCP # Enable below define for production -# ifneq ($(CONFIG_SOC_GOOGLE),) -# DHDCFLAGS += -DMACADDR_PROVISION_ENFORCED -# endif +ifneq ($(CONFIG_SOC_GOOGLE),) +DHDCFLAGS += -DMACADDR_PROVISION_ENFORCED +endif ifneq ($(CONFIG_BCMDHD_PCIE),) DHDCFLAGS += -DDHD_WAKE_STATUS endif |