commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=089999c21b6e0e029bd9ca5dcaf79152a69e3e5e branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
move ksz8893m from net/dsa to drivers/net/dsa Signed-off-by: Steven Miao <[email protected]> --- drivers/net/dsa/Kconfig | 8 ++++++++ drivers/net/dsa/Makefile | 1 + {net => drivers/net}/dsa/ksz8893m.c | 0 {net => drivers/net}/dsa/ksz8893m.h | 0 net/dsa/Makefile | 14 ++++---------- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index b8fe808..b382dd1 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -36,4 +36,12 @@ config NET_DSA_MV88E6123_61_65 This enables support for the Marvell 88E6123/6161/6165 ethernet switch chips. +config NET_DSA_KSZ8893M + tristate "MICREL KSZ8893MQL/BL ethernet switch chip support" + depends on SPI + select NET_DSA + select NET_DSA_TAG_STPID + ---help--- + This enables support for the Micrel KSZ8893MQL/BL + ethernet switch chips. endmenu diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index f3bda05..e308926 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile @@ -7,3 +7,4 @@ endif ifdef CONFIG_NET_DSA_MV88E6131 mv88e6xxx_drv-y += mv88e6131.o endif +obj-$(CONFIG_NET_DSA_KSZ8893M) += ksz8893m.o diff --git a/net/dsa/ksz8893m.c b/drivers/net/dsa/ksz8893m.c similarity index 100% rename from net/dsa/ksz8893m.c rename to drivers/net/dsa/ksz8893m.c diff --git a/net/dsa/ksz8893m.h b/drivers/net/dsa/ksz8893m.h similarity index 100% rename from net/dsa/ksz8893m.h rename to drivers/net/dsa/ksz8893m.h diff --git a/net/dsa/Makefile b/net/dsa/Makefile index c4295e3..4091fed 100644 --- a/net/dsa/Makefile +++ b/net/dsa/Makefile @@ -1,15 +1,9 @@ +# the core +obj-$(CONFIG_NET_DSA) += dsa_core.o +dsa_core-y += dsa.o slave.o + # tagging formats obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o obj-$(CONFIG_NET_DSA_TAG_STPID) += tag_stpid.o - -# switch drivers -obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o -obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o -obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o -obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o -obj-$(CONFIG_NET_DSA_KSZ8893M) += ksz8893m.o - -# the core -obj-$(CONFIG_NET_DSA) += dsa.o slave.o
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
