staging/octeon: Fix test build on MIPS
PATCH 1/1 staging/octeon: Fix test build on MIPS
mips:allmodconfig fails to build.
drivers/staging/octeon/ethernet-rx.c: In function 'cvm_oct_poll':drivers/staging/octeon/ethernet-defines.h:30:38: error:
'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared
Octeon defines are only available if CONFIG_CPU_CAVIUM_OCTEON is enabled. Since the driver uses those defines, we have to use the dummy defines if this flag is not enabled.
--- drivers/staging/octeon/octeon-ethernet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/octeon/octeon-ethernet.h +1 -1
@@ -14,7 +14,7 @@#include <linux/of.h> #include <linux/phy.h> -#ifdef CONFIG_MIPS +#ifdef CONFIG_CPU_CAVIUM_OCTEON #include <asm/octeon/octeon.h>
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerQuoted 23 lines · Guenter Roeck
mips:allmodconfig fails to build.
drivers/staging/octeon/ethernet-rx.c: In function 'cvm_oct_poll':drivers/staging/octeon/ethernet-defines.h:30:38: error:
'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclaredOcteon defines are only available if
CONFIG_CPU_CAVIUM_OCTEONis enabled. Since the driver uses those defines, we have to use the dummy defines if this flag is not enabled.Cc Matthew Wilcox (Oracle) <[email protected]>Fixes 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS")Signed-off-by Guenter Roeck <[email protected]>Cc stable <[email protected]>--- drivers/staging/octeon/octeon-ethernet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/octeon/octeon-ethernet.h +0
-0
drivers/staging/octeon/octeon-ethernet.h line 20
Quoted 8 lines
drivers/staging/octeon/octeon-ethernet.h +1
-1@@ -14,7 +14,7 @@#include <linux/of.h> #include <linux/phy.h> -#ifdef CONFIG_MIPS +#ifdef CONFIG_CPU_CAVIUM_OCTEON #include <asm/octeon/octeon.h>
Already in my tree, sorry for the delay, will show up in 5.5-rc1 and get backported to 5.4.y
thanks,
greg k-h