* [PATCH] net: smc91x: fix neponset breakage by pxa u16 writes
@ 2016-10-19 21:23 Robert Jarzmik
2016-10-20 15:21 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Robert Jarzmik @ 2016-10-19 21:23 UTC (permalink / raw)
To: Nicolas Pitre, David S. Miller; +Cc: netdev, linux-kernel, Robert Jarzmik
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>
---
drivers/net/ethernet/smsc/smc91x.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 45e6b81a6a92..08b17adf0a65 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
*/
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: smc91x: fix neponset breakage by pxa u16 writes
2016-10-19 21:23 [PATCH] net: smc91x: fix neponset breakage by pxa u16 writes Robert Jarzmik
@ 2016-10-20 15:21 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-10-20 15:21 UTC (permalink / raw)
To: robert.jarzmik; +Cc: nico, netdev, linux-kernel
From: Robert Jarzmik <robert.jarzmik@free.fr>
Date: Wed, 19 Oct 2016 23:23:50 +0200
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-20 15:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-19 21:23 [PATCH] net: smc91x: fix neponset breakage by pxa u16 writes Robert Jarzmik
2016-10-20 15:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).