summaryrefslogtreecommitdiff
path: root/net/ipv4/inet_diag.c
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2016-10-20 00:23:50 +0300
committerDavid S. Miller <davem@davemloft.net>2016-10-20 18:20:57 +0300
commit25c07e2c5ec80a1c7390b41e2b03ca3d0e31fc01 (patch)
tree04a918eb6227ad1ff47a48fd5ce53909d7015469 /net/ipv4/inet_diag.c
parentc5098ebbd6605e7ba1fd1dbfe4c1297ac2ab7362 (diff)
downloadlinux-25c07e2c5ec80a1c7390b41e2b03ca3d0e31fc01.tar.xz
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: d09d747ae4c2 ("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>
Diffstat (limited to 'net/ipv4/inet_diag.c')
0 files changed, 0 insertions, 0 deletions