Commit 6f24e159 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-Split-platform-data-to-header-file' 



Florian Fainelli says:

====================
net: dsa: Split platform data to header file

This patch series decouples the DSA platform data structures from
net/dsa.h which was getting used for all sorts of DSA related
structures.

It would probably make sense for this series to go via David's net-next
tree to avoid conflicts on the ARM part, since we cannot obviously
include a header that does not yet exist.

No functional changes intended.
====================

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 905b464a 8cfb5faf

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10576,6 +10576,7 @@ F: Documentation/devicetree/bindings/net/dsa/ 
F:	net/dsa/

F:	include/net/dsa.h

F:	include/linux/dsa/

F:	include/linux/platform_data/dsa.h

F:	drivers/net/dsa/



NETWORKING [GENERAL]

arch/arm/mach-orion5x/common.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/delay.h>

#include <linux/clk-provider.h>

#include <linux/cpu.h>

#include <net/dsa.h>

#include <linux/platform_data/dsa.h>

#include <asm/page.h>

#include <asm/setup.h>

#include <asm/system_misc.h>

arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/mtd/physmap.h>

#include <linux/mv643xx_eth.h>

#include <linux/ethtool.h>

#include <net/dsa.h>

#include <linux/platform_data/dsa.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>

arch/arm/mach-orion5x/rd88f5181l-ge-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/mv643xx_eth.h>

#include <linux/ethtool.h>

#include <linux/i2c.h>

#include <net/dsa.h>

#include <linux/platform_data/dsa.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>

arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#include <linux/ethtool.h>

#include <net/dsa.h>

#include <linux/platform_data/dsa.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE