---

yaml --- r: 327723 b: refs/heads/master c: 0739d64 h: refs/heads/master i: 327721: 3760af0 327719: 509a242 v: v3
git-mirror · Aug 30, 2012 · 1cb2e5a · 1cb2e5a
1 parent 41e795f
commit 1cb2e5a
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → trunk/drivers/net/ieee802154/Kconfig b/trunk/drivers/ieee802154/Kconfig → trunk/drivers/net/ieee802154/Kconfig
diff --git a/trunk/drivers/ieee802154/Makefile → trunk/drivers/net/ieee802154/Makefile b/trunk/drivers/ieee802154/Makefile → trunk/drivers/net/ieee802154/Makefile
diff --git a/trunk/drivers/ieee802154/at86rf230.c → trunk/drivers/net/ieee802154/at86rf230.c b/trunk/drivers/ieee802154/at86rf230.c → trunk/drivers/net/ieee802154/at86rf230.c
diff --git a/trunk/drivers/ieee802154/fakehard.c → trunk/drivers/net/ieee802154/fakehard.c b/trunk/drivers/ieee802154/fakehard.c → 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 → trunk/drivers/net/ieee802154/fakelb.c b/trunk/drivers/ieee802154/fakelb.c → trunk/drivers/net/ieee802154/fakelb.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -446,4 +446,3 @@ static __exit void fake_exit(void)
		module_init(fake_init);
		module_exit(fake_exit);
		MODULE_LICENSE("GPL");