Revert "appletalk: move to staging"
This reverts commit a6238f21736af3f47bdebf3895f477f5f23f1af9
Appletalk got some patches to fix up the BLK usage in it in the
network tree, so this removal isn't needed.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: <acme@ghostprotocols.net>
Cc: netdev@vger.kernel.org,
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/net/Makefile b/net/Makefile
index 16d9947..a3330eb 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -27,6 +27,7 @@
obj-$(CONFIG_BRIDGE) += bridge/
obj-$(CONFIG_NET_DSA) += dsa/
obj-$(CONFIG_IPX) += ipx/
+obj-$(CONFIG_ATALK) += appletalk/
obj-$(CONFIG_WAN_ROUTER) += wanrouter/
obj-$(CONFIG_X25) += x25/
obj-$(CONFIG_LAPB) += lapb/