Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278f04fc authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sdxprairie: enable TZ-log driver"

parents f5e02a4f bad61881

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ CONFIG_QTI_RPM_STATS_LOG=y 
CONFIG_MSM_PM=y

CONFIG_PWM=y

CONFIG_ANDROID=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_VFAT_FS=y

arch/arm/configs/vendor/sdxprairie_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ CONFIG_MSM_PM=y 
CONFIG_PWM=y

CONFIG_ANDROID=y

CONFIG_STM=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_VFAT_FS=y

drivers/staging/android/ion/ion_kernel.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -30,7 +30,7 @@ struct dma_buf *ion_alloc(size_t len, unsigned int heap_id_mask, 
static inline struct dma_buf *ion_alloc(size_t len, unsigned int heap_id_mask,

					unsigned int flags)

{

	return -ENOMEM;

	return ERR_PTR(-ENOMEM);

}



#endif /* CONFIG_ION */