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

Commit 3bc2e8bd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: enable ipa nodes on titanium"

parents f6a010ea d0f1c327

arch/arm64/configs/msmcortex_defconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -495,8 +495,10 @@ CONFIG_QPNP_COINCELL=y 
CONFIG_SPS=y

CONFIG_SPS=y

CONFIG_USB_BAM=y

CONFIG_USB_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA=y

CONFIG_IPA3=y

CONFIG_IPA3=y

CONFIG_GSI=y

CONFIG_GSI=y

CONFIG_RMNET_IPA=y

CONFIG_RMNET_IPA3=y

CONFIG_RMNET_IPA3=y

CONFIG_QPNP_HAPTIC=y

CONFIG_QPNP_HAPTIC=y

CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI=y

drivers/platform/msm/ipa/ipa_v3/ipa.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2736,7 +2736,7 @@ static void ipa3_teardown_apps_pipes(void) 
}

}





#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

long compat_ipa_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

long compat_ipa3_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

{

	int retval = 0;

	int retval = 0;

	struct ipa3_ioc_nat_alloc_mem32 nat_mem32;

	struct ipa3_ioc_nat_alloc_mem32 nat_mem32;
@@ -2881,7 +2881,7 @@ static const struct file_operations ipa3_drv_fops = { 
	.write = ipa3_write,

	.write = ipa3_write,

	.unlocked_ioctl = ipa3_ioctl,

	.unlocked_ioctl = ipa3_ioctl,

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

	.compat_ioctl = compat_ipa_ioctl,

	.compat_ioctl = compat_ipa3_ioctl,

#endif

#endif

};

};