From 1cb2e5a4c38f048de6600c8766e58ba25dec2ea0 Mon Sep 17 00:00:00 2001 From: "alex.bluesman.smirnov@gmail.com" Date: Sun, 26 Aug 2012 05:10:11 +0000 Subject: [PATCH] --- yaml --- r: 327723 b: refs/heads/master c: 0739d643b8dda866d1011bcfd01008d29593be03 h: refs/heads/master i: 327721: 3760af099aac7f820e61ac8b1f9e49c68d9c5014 327719: 509a2423c5f08aa58afb20dac8cbfbcff2bf9786 v: v3 --- [refs] | 2 +- trunk/drivers/Makefile | 1 - trunk/drivers/net/Kconfig | 4 ++-- trunk/drivers/net/Makefile | 1 + trunk/drivers/{ => net}/ieee802154/Kconfig | 0 trunk/drivers/{ => net}/ieee802154/Makefile | 0 trunk/drivers/{ => net}/ieee802154/at86rf230.c | 0 trunk/drivers/{ => net}/ieee802154/fakehard.c | 1 - trunk/drivers/{ => net}/ieee802154/fakelb.c | 0 9 files changed, 4 insertions(+), 5 deletions(-) rename trunk/drivers/{ => net}/ieee802154/Kconfig (100%) rename trunk/drivers/{ => net}/ieee802154/Makefile (100%) rename trunk/drivers/{ => net}/ieee802154/at86rf230.c (100%) rename trunk/drivers/{ => net}/ieee802154/fakehard.c (99%) rename trunk/drivers/{ => net}/ieee802154/fakelb.c (100%) diff --git a/[refs] b/[refs] index b4d160ac0bf1..95a04f8ef3ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 395a57385508f7b8b445b6911bfa35bc0ccaa0ff +refs/heads/master: 0739d643b8dda866d1011bcfd01008d29593be03 diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile index 5b421840c48d..1ecd1bfe5069 100644 --- a/trunk/drivers/Makefile +++ b/trunk/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/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 0c2bd806950e..707ab7bd4ea5 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/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/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile index 3d375ca128a6..b682a1de7be8 100644 --- a/trunk/drivers/net/Makefile +++ b/trunk/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/trunk/drivers/ieee802154/Kconfig b/trunk/drivers/net/ieee802154/Kconfig similarity index 100% rename from trunk/drivers/ieee802154/Kconfig rename to trunk/drivers/net/ieee802154/Kconfig diff --git a/trunk/drivers/ieee802154/Makefile b/trunk/drivers/net/ieee802154/Makefile similarity index 100% rename from trunk/drivers/ieee802154/Makefile rename to trunk/drivers/net/ieee802154/Makefile diff --git a/trunk/drivers/ieee802154/at86rf230.c b/trunk/drivers/net/ieee802154/at86rf230.c similarity index 100% rename from trunk/drivers/ieee802154/at86rf230.c rename to trunk/drivers/net/ieee802154/at86rf230.c diff --git a/trunk/drivers/ieee802154/fakehard.c b/trunk/drivers/net/ieee802154/fakehard.c similarity index 99% rename from trunk/drivers/ieee802154/fakehard.c rename to trunk/drivers/net/ieee802154/fakehard.c index 73d453159408..7d39add7d467 100644 --- a/trunk/drivers/ieee802154/fakehard.c +++ b/trunk/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/trunk/drivers/ieee802154/fakelb.c b/trunk/drivers/net/ieee802154/fakelb.c similarity index 100% rename from trunk/drivers/ieee802154/fakelb.c rename to trunk/drivers/net/ieee802154/fakelb.c