]> git.baikalelectronics.ru Git - kernel.git/commit
net: smc91x: fix neponset breakage by pxa u16 writes
authorRobert Jarzmik <robert.jarzmik@free.fr>
Wed, 19 Oct 2016 21:23:50 +0000 (23:23 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Oct 2016 15:20:57 +0000 (11:20 -0400)
commit858fc72d2daf36675c8baba3c5df4f4acd9bc189
tree04a918eb6227ad1ff47a48fd5ce53909d7015469
parent319de0469c68b42793b1a756de15caa608093280
net: smc91x: fix neponset breakage by pxa u16 writes

The patch isolating the u16 writes for pxa assumed all machine_is_*()
calls were removed, and therefore removed the mach-types.h include which
provided them.

Unfortunately 2 machine_is_*() remained in smc91x.c file including
smc91x.h from which the include was removed, triggering the error:
 drivers/net/ethernet/smsc/smc91x.c: In function ‘smc_drv_probe’:
 drivers/net/ethernet/smsc/smc91x.c:2380:2: error: implicit declaration
 of function ‘machine_is_assabet’
 [-Werror=implicit-function-declaration]
if (machine_is_assabet() && machine_has_neponset())

This adds back the wrongly removed include.

Fixes: f2697c935fe2 ("net: smc91x: isolate u16 writes alignment workaround")
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/smsc/smc91x.h