diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2016-10-19 23:23:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-20 11:20:57 -0400 |
| commit | 25c07e2c5ec80a1c7390b41e2b03ca3d0e31fc01 (patch) | |
| tree | 04a918eb6227ad1ff47a48fd5ce53909d7015469 | |
| parent | c5098ebbd6605e7ba1fd1dbfe4c1297ac2ab7362 (diff) | |
| download | op-kernel-dev-25c07e2c5ec80a1c7390b41e2b03ca3d0e31fc01.zip op-kernel-dev-25c07e2c5ec80a1c7390b41e2b03ca3d0e31fc01.tar.gz | |
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>
| -rw-r--r-- | drivers/net/ethernet/smsc/smc91x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h index 45e6b81..08b17ad 100644 --- a/drivers/net/ethernet/smsc/smc91x.h +++ b/drivers/net/ethernet/smsc/smc91x.h @@ -63,6 +63,8 @@ #if defined(CONFIG_ARM) +#include <asm/mach-types.h> + /* Now the bus width is specified in the platform data * pretend here to support all I/O access types */ |
