diff options
| author | alex.bluesman.smirnov@gmail.com <alex.bluesman.smirnov@gmail.com> | 2012-08-26 01:10:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-30 13:23:56 -0400 |
| commit | 0739d643b8dda866d1011bcfd01008d29593be03 (patch) | |
| tree | 4748f4a416a6711bb5d6b889f9d3fa342921376f /drivers | |
| parent | 395a57385508f7b8b445b6911bfa35bc0ccaa0ff (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ieee802154/Kconfig (renamed from drivers/ieee802154/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/net/ieee802154/Makefile (renamed from drivers/ieee802154/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/ieee802154/at86rf230.c (renamed from drivers/ieee802154/at86rf230.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ieee802154/fakehard.c (renamed from drivers/ieee802154/fakehard.c) | 1 | ||||
| -rw-r--r-- | drivers/net/ieee802154/fakelb.c (renamed from drivers/ieee802154/fakelb.c) | 0 |
8 files changed, 3 insertions, 4 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 5b421840c48d..1ecd1bfe5069 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -120,7 +120,6 @@ obj-$(CONFIG_VHOST_NET) += vhost/ | |||
| 120 | obj-$(CONFIG_VLYNQ) += vlynq/ | 120 | obj-$(CONFIG_VLYNQ) += vlynq/ |
| 121 | obj-$(CONFIG_STAGING) += staging/ | 121 | obj-$(CONFIG_STAGING) += staging/ |
| 122 | obj-y += platform/ | 122 | obj-y += platform/ |
| 123 | obj-y += ieee802154/ | ||
| 124 | #common clk code | 123 | #common clk code |
| 125 | obj-y += clk/ | 124 | obj-y += clk/ |
| 126 | 125 | ||
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0c2bd806950e..707ab7bd4ea5 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -107,8 +107,6 @@ config MII | |||
| 107 | or internal device. It is safe to say Y or M here even if your | 107 | or internal device. It is safe to say Y or M here even if your |
| 108 | ethernet card lacks MII. | 108 | ethernet card lacks MII. |
| 109 | 109 | ||
| 110 | source "drivers/ieee802154/Kconfig" | ||
| 111 | |||
| 112 | config IFB | 110 | config IFB |
| 113 | tristate "Intermediate Functional Block support" | 111 | tristate "Intermediate Functional Block support" |
| 114 | depends on NET_CLS_ACT | 112 | depends on NET_CLS_ACT |
| @@ -290,6 +288,8 @@ source "drivers/net/wimax/Kconfig" | |||
| 290 | 288 | ||
| 291 | source "drivers/net/wan/Kconfig" | 289 | source "drivers/net/wan/Kconfig" |
| 292 | 290 | ||
| 291 | source "drivers/net/ieee802154/Kconfig" | ||
| 292 | |||
| 293 | config XEN_NETDEV_FRONTEND | 293 | config XEN_NETDEV_FRONTEND |
| 294 | tristate "Xen network device frontend driver" | 294 | tristate "Xen network device frontend driver" |
| 295 | depends on XEN | 295 | depends on XEN |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 3d375ca128a6..b682a1de7be8 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -53,6 +53,7 @@ obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o | |||
| 53 | obj-$(CONFIG_WAN) += wan/ | 53 | obj-$(CONFIG_WAN) += wan/ |
| 54 | obj-$(CONFIG_WLAN) += wireless/ | 54 | obj-$(CONFIG_WLAN) += wireless/ |
| 55 | obj-$(CONFIG_WIMAX) += wimax/ | 55 | obj-$(CONFIG_WIMAX) += wimax/ |
| 56 | obj-$(CONFIG_IEEE802154) += ieee802154/ | ||
| 56 | 57 | ||
| 57 | obj-$(CONFIG_VMXNET3) += vmxnet3/ | 58 | obj-$(CONFIG_VMXNET3) += vmxnet3/ |
| 58 | obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o | 59 | obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o |
diff --git a/drivers/ieee802154/Kconfig b/drivers/net/ieee802154/Kconfig index 1fc4eefc20ed..1fc4eefc20ed 100644 --- a/drivers/ieee802154/Kconfig +++ b/drivers/net/ieee802154/Kconfig | |||
diff --git a/drivers/ieee802154/Makefile b/drivers/net/ieee802154/Makefile index 4f4371d3aa7d..4f4371d3aa7d 100644 --- a/drivers/ieee802154/Makefile +++ b/drivers/net/ieee802154/Makefile | |||
diff --git a/drivers/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index ba753d87a32f..ba753d87a32f 100644 --- a/drivers/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c | |||
diff --git a/drivers/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c index 73d453159408..7d39add7d467 100644 --- a/drivers/ieee802154/fakehard.c +++ b/drivers/net/ieee802154/fakehard.c | |||
| @@ -446,4 +446,3 @@ static __exit void fake_exit(void) | |||
| 446 | module_init(fake_init); | 446 | module_init(fake_init); |
| 447 | module_exit(fake_exit); | 447 | module_exit(fake_exit); |
| 448 | MODULE_LICENSE("GPL"); | 448 | MODULE_LICENSE("GPL"); |
| 449 | |||
diff --git a/drivers/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c index e7456fcd0913..e7456fcd0913 100644 --- a/drivers/ieee802154/fakelb.c +++ b/drivers/net/ieee802154/fakelb.c | |||
