lakitu: Fix merge error in kernel ebuilds
It looks like two different changes were made to the kernel ebuilds at
roughly the same time, and somewhere the merge didn't really work. Right
now, there are two kernel ebuilds, each with different desired features.
This patch merges the two ebuilds together and increments the revision
number.
BUG=b:134583681
TEST=`emerge-lakitu lakitu-kernel` and `build_image`
RELEASE_NOTE=None
Change-Id: I74a42d815c133f779651287efeb6f3fbc37cc30f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/board-overlays/+/2117035
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Tested-by: Robert Kolchmeyer <rkolchmeyer@google.com>
2 files changed