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

Commit 471c7ec3 authored Apr 10, 2018 by Greg Kroah-Hartman

Merge 3.18.104 into android-3.18



Changes in 3.18.104
	net: fec: fix build error in fec driver
	Linux 3.18.104

Change-Id: I950580a07db2f2bb5e73b400bdd73516b63ba73a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents c1d1d0d8 fb625ba7

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 18
		SUBLEVEL = 103
		SUBLEVEL = 104
		EXTRAVERSION =
		NAME = Diseased Newt

drivers/net/ethernet/freescale/fec_main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		#include <linux/if_vlan.h>
		#include <linux/pinctrl/consumer.h>
		#include <linux/prefetch.h>
		#include <linux/pm_runtime.h>

		#include <asm/cacheflush.h>