diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-01-23 16:11:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-01-23 16:11:11 +0100 |
| commit | fc5470b839d979082c5646182e026c226ebdc378 (patch) | |
| tree | 0c0c7705e9a8cddb0bc6221cb6051f9183d055dc /include/linux | |
| parent | cf3e310ff85b280eec62a1470465d986be80c204 (diff) | |
| parent | 4f907dff9d3629fc87f9608770168b68958a9f46 (diff) | |
Merge 4.4.253 into android-4.4-p
Changes in 4.4.253
ASoC: dapm: remove widget from dirty list on free
mm/hugetlb: fix potential missing huge page size info
ext4: fix bug for rename with RENAME_WHITEOUT
ARC: build: add boot_targets to PHONY
ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram
arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC
misdn: dsp: select CONFIG_BITREVERSE
net: ethernet: fs_enet: Add missing MODULE_LICENSE
ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
ARM: picoxcell: fix missing interrupt-parent properties
Input: uinput - avoid FF flush when destroying device
dump_common_audit_data(): fix racy accesses to ->d_name
NFS: nfs_igrab_and_active must first reference the superblock
ext4: fix superblock checksum failure when setting password salt
RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp
mm, slub: consider rest of partial list if acquire_slab() fails
net: sunrpc: interpret the return value of kstrtou32 correctly
usb: ohci: Make distrust_firmware param default to false
iio: buffer: Fix demux update
nfsd4: readdirplus shouldn't return parent of export
net: cdc_ncm: correct overhead in delayed_ndp_size
netxen_nic: fix MSI/MSI-x interrupts
rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request
net: dcb: Validate netlink message in DCB handler
net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands
net: sit: unregister_netdevice on newlink's error path
rxrpc: Fix handling of an unsupported token type in rxrpc_read()
net: avoid 32 x truesize under-estimation for tiny skbs
spi: cadence: cache reference clock rate during probe
Linux 4.4.253
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I654eb9f2b62aea6745aeae37341e162ab2a6a596
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 7 | ||||
| -rw-r--r-- | include/linux/input.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 0bd0a9ad5455..719fb8b320fd 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -604,6 +604,13 @@ static inline int acpi_device_modalias(struct device *dev, return -ENODEV; } +static inline struct platform_device * +acpi_create_platform_device(struct acpi_device *adev, + struct property_entry *properties) +{ + return NULL; +} + static inline bool acpi_dma_supported(struct acpi_device *adev) { return false; diff --git a/include/linux/input.h b/include/linux/input.h index 1e967694e9a5..b365d7c31e58 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -529,6 +529,7 @@ int input_ff_event(struct input_dev *dev, unsigned int type, unsigned int code, int input_ff_upload(struct input_dev *dev, struct ff_effect *effect, struct file *file); int input_ff_erase(struct input_dev *dev, int effect_id, struct file *file); +int input_ff_flush(struct input_dev *dev, struct file *file); int input_ff_create_memless(struct input_dev *dev, void *data, int (*play_effect)(struct input_dev *, void *, struct ff_effect *)); |