Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Completely minor snmp doc conflict. Signed-off-by: David S. Miller <davem@davemloft.net>
2019-01-21 14:41:32 -08:00
parent 28f9d1a3d4 49a57857ae
commit fa7f3a8d56
331 changed files with 3354 additions and 1444 deletions
--- a/arch/mips/include/asm/mach-lantiq/falcon/falcon_irq.h
+++ b/arch/mips/include/asm/mach-lantiq/falcon/falcon_irq.h
@@ -18,8 +18,6 @@
 #define INT_NUM_EXTRA_START		(INT_NUM_IM4_IRL0 + 32)
 #define INT_NUM_IM_OFFSET		(INT_NUM_IM1_IRL0 - INT_NUM_IM0_IRL0)

-#define MIPS_CPU_TIMER_IRQ			7
-
 #define MAX_IM			5

 #endif /* _FALCON_IRQ__ */
--- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h
+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h
@@ -19,8 +19,6 @@

 #define LTQ_DMA_CH0_INT		(INT_NUM_IM2_IRL0)

-#define MIPS_CPU_TIMER_IRQ	7
-
 #define MAX_IM			5

 #endif