Commit 0066ae3a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: fix up fsnotify.h merge error in previous upstream merge.

Commit dd5c9369 ("Merge 7e634208 ("Merge tag 'acpi-5.7-rc1-2' of
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm"

) into
android-mainline") was not done properly, and had a half-completed merge
of fsnotify.h

This should fix that build issue.

Thanks to YongQin Liu for the quick notice of this error.

Reported-by: default avatarYongQin Liu <yongqin.liu@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I5fabf513c150cbd833215b71d89f8ff38d8b9e33
parent bfcc51e5
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment