Revert "appletalk: move to staging"

This reverts commit a6238f2 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>
git-mirror · Jan 31, 2011 · 0ffbf8b · 0ffbf8b
1 parent 51da8e2
commit 0ffbf8b
Show file tree

Hide file tree

Showing 26 changed files with 25 additions and 17 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -554,7 +554,8 @@ F:	drivers/hwmon/applesmc.c
 APPLETALK NETWORK LAYER
 M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:	Maintained
-F:	drivers/staging/appletalk/
+F:	drivers/net/appletalk/
+F:	net/appletalk/
 
 ARC FRAMEBUFFER DRIVER
 M:	Jaya Kumar <jayalk@intworks.biz>

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
@@ -265,6 +265,7 @@ obj-$(CONFIG_MACB) += macb.o
 obj-$(CONFIG_S6GMAC) += s6gmac.o
 
 obj-$(CONFIG_ARM) += arm/
+obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_ARCNET) += arcnet/

diff --git a/drivers/staging/appletalk/Kconfig → drivers/net/appletalk/Kconfig b/drivers/staging/appletalk/Kconfig → drivers/net/appletalk/Kconfig
diff --git a/drivers/net/appletalk/Makefile b/drivers/net/appletalk/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for drivers/net/appletalk
+#
+
+obj-$(CONFIG_IPDDP) += ipddp.o
+obj-$(CONFIG_COPS) += cops.o
+obj-$(CONFIG_LTPC) += ltpc.o
diff --git a/drivers/staging/appletalk/cops.c → drivers/net/appletalk/cops.c b/drivers/staging/appletalk/cops.c → drivers/net/appletalk/cops.c
@@ -65,6 +65,7 @@ static const char *version =
 #include <linux/if_arp.h>
 #include <linux/if_ltalk.h>
 #include <linux/delay.h>	/* For udelay() */
+#include <linux/atalk.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
@@ -73,7 +74,6 @@ static const char *version =
 #include <asm/io.h>
 #include <asm/dma.h>
 
-#include "atalk.h"
 #include "cops.h"		/* Our Stuff */
 #include "cops_ltdrv.h"		/* Firmware code for Tangent type cards. */
 #include "cops_ffdrv.h"		/* Firmware code for Dayna type cards. */

diff --git a/drivers/staging/appletalk/cops.h → drivers/net/appletalk/cops.h b/drivers/staging/appletalk/cops.h → drivers/net/appletalk/cops.h
diff --git a/drivers/staging/appletalk/cops_ffdrv.h → drivers/net/appletalk/cops_ffdrv.h b/drivers/staging/appletalk/cops_ffdrv.h → drivers/net/appletalk/cops_ffdrv.h
diff --git a/drivers/staging/appletalk/cops_ltdrv.h → drivers/net/appletalk/cops_ltdrv.h b/drivers/staging/appletalk/cops_ltdrv.h → drivers/net/appletalk/cops_ltdrv.h
diff --git a/drivers/staging/appletalk/ipddp.c → drivers/net/appletalk/ipddp.c b/drivers/staging/appletalk/ipddp.c → drivers/net/appletalk/ipddp.c
@@ -29,12 +29,12 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ip.h>
+#include <linux/atalk.h>
 #include <linux/if_arp.h>
 #include <linux/slab.h>
 #include <net/route.h>
 #include <asm/uaccess.h>
 
-#include "atalk.h"
 #include "ipddp.h"		/* Our stuff */
 
 static const char version[] = KERN_INFO "ipddp.c:v0.01 8/28/97 Bradford W. Johnson <johns393@maroon.tc.umn.edu>\n";

diff --git a/drivers/staging/appletalk/ipddp.h → drivers/net/appletalk/ipddp.h b/drivers/staging/appletalk/ipddp.h → drivers/net/appletalk/ipddp.h
diff --git a/drivers/staging/appletalk/ltpc.c → drivers/net/appletalk/ltpc.c b/drivers/staging/appletalk/ltpc.c → drivers/net/appletalk/ltpc.c
@@ -225,6 +225,7 @@ static int dma;
 #include <linux/if_ltalk.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
+#include <linux/atalk.h>
 #include <linux/bitops.h>
 #include <linux/gfp.h>
 
@@ -233,7 +234,6 @@ static int dma;
 #include <asm/io.h>
 
 /* our stuff */
-#include "atalk.h"
 #include "ltpc.h"
 
 static DEFINE_SPINLOCK(txqueue_lock);

diff --git a/drivers/staging/appletalk/ltpc.h → drivers/net/appletalk/ltpc.h b/drivers/staging/appletalk/ltpc.h → drivers/net/appletalk/ltpc.h
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
@@ -169,8 +169,6 @@ source "drivers/staging/bcm/Kconfig"
 
 source "drivers/staging/ft1000/Kconfig"
 
-source "drivers/staging/appletalk/Kconfig"
-
 source "drivers/staging/intel_sst/Kconfig"
 
 source "drivers/staging/speakup/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
@@ -65,7 +65,6 @@ obj-$(CONFIG_ATH6K_LEGACY)	+= ath6kl/
 obj-$(CONFIG_USB_ENESTORAGE)	+= keucr/
 obj-$(CONFIG_BCM_WIMAX)	+= bcm/
 obj-$(CONFIG_FT1000)		+= ft1000/
-obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_SND_INTEL_SST)		+= intel_sst/
 obj-$(CONFIG_SPEAKUP)	+= speakup/
 obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
@@ -56,6 +56,7 @@
 #include <linux/syscalls.h>
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
+#include <linux/atalk.h>
 #include <linux/gfp.h>
 
 #include <net/bluetooth/bluetooth.h>

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
@@ -43,6 +43,7 @@ header-y += agpgart.h
 header-y += aio_abi.h
 header-y += apm_bios.h
 header-y += arcfb.h
+header-y += atalk.h
 header-y += atm.h
 header-y += atm_eni.h
 header-y += atm_he.h

diff --git a/drivers/staging/appletalk/atalk.h → include/linux/atalk.h b/drivers/staging/appletalk/atalk.h → include/linux/atalk.h
diff --git a/net/Kconfig b/net/Kconfig
@@ -204,6 +204,7 @@ source "net/8021q/Kconfig"
 source "net/decnet/Kconfig"
 source "net/llc/Kconfig"
 source "net/ipx/Kconfig"
+source "drivers/net/appletalk/Kconfig"
 source "net/x25/Kconfig"
 source "net/lapb/Kconfig"
 source "net/econet/Kconfig"

diff --git a/net/Makefile b/net/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_NET_KEY)		+= key/
 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/

diff --git a/drivers/staging/appletalk/Makefile → net/appletalk/Makefile b/drivers/staging/appletalk/Makefile → net/appletalk/Makefile
@@ -1,12 +1,9 @@
 #
-# Makefile for drivers/staging/appletalk
+# Makefile for the Linux AppleTalk layer.
 #
+
 obj-$(CONFIG_ATALK) += appletalk.o
 
 appletalk-y			:= aarp.o ddp.o dev.o
 appletalk-$(CONFIG_PROC_FS)	+= atalk_proc.o
 appletalk-$(CONFIG_SYSCTL)	+= sysctl_net_atalk.o
-
-obj-$(CONFIG_IPDDP) += ipddp.o
-obj-$(CONFIG_COPS) += cops.o
-obj-$(CONFIG_LTPC) += ltpc.o
diff --git a/drivers/staging/appletalk/aarp.c → net/appletalk/aarp.c b/drivers/staging/appletalk/aarp.c → net/appletalk/aarp.c
@@ -34,7 +34,7 @@
 #include <net/sock.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
-#include "atalk.h"
+#include <linux/atalk.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>

diff --git a/drivers/staging/appletalk/atalk_proc.c → net/appletalk/atalk_proc.c b/drivers/staging/appletalk/atalk_proc.c → net/appletalk/atalk_proc.c
@@ -13,7 +13,7 @@
 #include <linux/seq_file.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
-#include "atalk.h"
+#include <linux/atalk.h>
 
 
 static __inline__ struct atalk_iface *atalk_get_interface_idx(loff_t pos)

diff --git a/drivers/staging/appletalk/ddp.c → net/appletalk/ddp.c b/drivers/staging/appletalk/ddp.c → net/appletalk/ddp.c
@@ -63,8 +63,8 @@
 #include <net/sock.h>
 #include <net/tcp_states.h>
 #include <net/route.h>
-#include "atalk.h"
-#include "../../net/core/kmap_skb.h"
+#include <linux/atalk.h>
+#include "../core/kmap_skb.h"
 
 struct datalink_proto *ddp_dl, *aarp_dl;
 static const struct proto_ops atalk_dgram_ops;

diff --git a/drivers/staging/appletalk/dev.c → net/appletalk/dev.c b/drivers/staging/appletalk/dev.c → net/appletalk/dev.c
diff --git a/drivers/staging/appletalk/sysctl_net_atalk.c → net/appletalk/sysctl_net_atalk.c b/drivers/staging/appletalk/sysctl_net_atalk.c → net/appletalk/sysctl_net_atalk.c
@@ -8,7 +8,7 @@
 
 #include <linux/sysctl.h>
 #include <net/sock.h>
-#include "atalk.h"
+#include <linux/atalk.h>
 
 static struct ctl_table atalk_table[] = {
 	{

diff --git a/net/socket.c b/net/socket.c
@@ -103,6 +103,7 @@
 #include <linux/ipv6_route.h>
 #include <linux/route.h>
 #include <linux/sockios.h>
+#include <linux/atalk.h>
 
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,