From 0739d643b8dda866d1011bcfd01008d29593be03 Mon Sep 17 00:00:00 2001 From: "alex.bluesman.smirnov@gmail.com" Date: Sun, 26 Aug 2012 05:10:11 +0000 Subject: [PATCH] drivers/ieee802154: move ieee802154 drivers to net folder The IEEE 802.15.4 standard represents a networking protocol. I don't exactly know why drivers for this protocol are stored into the root 'driver' folder, but better will be to store them with other networking stuff. Currently there are only 3 drivers available for IEEE 802.15.4 stack, so lets do it now with the smallest overhead. Signed-off-by: Alexander Smirnov Signed-off-by: David S. Miller --- drivers/Makefile | 1 - drivers/net/Kconfig | 4 ++-- drivers/net/Makefile | 1 + drivers/{ => net}/ieee802154/Kconfig | 0 drivers/{ => net}/ieee802154/Makefile | 0 drivers/{ => net}/ieee802154/at86rf230.c | 0 drivers/{ => net}/ieee802154/fakehard.c | 1 - drivers/{ => net}/ieee802154/fakelb.c | 0 8 files changed, 3 insertions(+), 4 deletions(-) rename drivers/{ => net}/ieee802154/Kconfig (100%) rename drivers/{ => net}/ieee802154/Makefile (100%) rename drivers/{ => net}/ieee802154/at86rf230.c (100%) rename drivers/{ => net}/ieee802154/fakehard.c (99%) rename drivers/{ => net}/ieee802154/fakelb.c (100%) diff --git a/drivers/Makefile b/drivers/Makefile index 5b42184..1ecd1bf 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -120,7 +120,6 @@ obj-$(CONFIG_VHOST_NET) += vhost/ obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/ -obj-y += ieee802154/ #common clk code obj-y += clk/ diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0c2bd80..707ab7b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -107,8 +107,6 @@ config MII or internal device. It is safe to say Y or M here even if your ethernet card lacks MII. -source "drivers/ieee802154/Kconfig" - config IFB tristate "Intermediate Functional Block support" depends on NET_CLS_ACT @@ -290,6 +288,8 @@ source "drivers/net/wimax/Kconfig" source "drivers/net/wan/Kconfig" +source "drivers/net/ieee802154/Kconfig" + config XEN_NETDEV_FRONTEND tristate "Xen network device frontend driver" depends on XEN diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 3d375ca..b682a1d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o obj-$(CONFIG_WAN) += wan/ obj-$(CONFIG_WLAN) += wireless/ obj-$(CONFIG_WIMAX) += wimax/ +obj-$(CONFIG_IEEE802154) += ieee802154/ obj-$(CONFIG_VMXNET3) += vmxnet3/ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o diff --git a/drivers/ieee802154/Kconfig b/drivers/net/ieee802154/Kconfig similarity index 100% rename from drivers/ieee802154/Kconfig rename to drivers/net/ieee802154/Kconfig diff --git a/drivers/ieee802154/Makefile b/drivers/net/ieee802154/Makefile similarity index 100% rename from drivers/ieee802154/Makefile rename to drivers/net/ieee802154/Makefile diff --git a/drivers/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c similarity index 100% rename from drivers/ieee802154/at86rf230.c rename to drivers/net/ieee802154/at86rf230.c diff --git a/drivers/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c similarity index 99% rename from drivers/ieee802154/fakehard.c rename to drivers/net/ieee802154/fakehard.c index 73d4531..7d39add 100644 --- a/drivers/ieee802154/fakehard.c +++ b/drivers/net/ieee802154/fakehard.c @@ -446,4 +446,3 @@ static __exit void fake_exit(void) module_init(fake_init); module_exit(fake_exit); MODULE_LICENSE("GPL"); - diff --git a/drivers/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c similarity index 100% rename from drivers/ieee802154/fakelb.c rename to drivers/net/ieee802154/fakelb.c -- 2.7.4