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 <alex.bluesman.smirnov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/Makefile b/drivers/Makefile
index 5b421840c48d28284978b6a8d6aa94eb15097c08..1ecd1bfe506965de4b2682af5ae1c0827c350c59 100644 (file)
--- 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 0c2bd806950e16313605ee62151e25e2c4a3730b..707ab7bd4ea51688f502fa528d57371b3fdb3438 100644 (file)
--- 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 3d375ca128a6d1a657782a467db56e9116587f74..b682a1de7be8ab5b2b3ad9d5c47e7c6dd999df87 100644 (file)
--- 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 73d453159408d62725e81317001889071211f094..7d39add7d467712f8cb21ec9aee4d01cd6606c7f 100644 (file)
--- 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