Commit 0ffbf8bf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "appletalk: move to staging" 



This reverts commit a6238f21

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 51da8e2b

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -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>

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/net/appletalk/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#

# Makefile for drivers/net/appletalk

#



obj-$(CONFIG_IPDDP) += ipddp.o

obj-$(CONFIG_COPS) += cops.o

obj-$(CONFIG_LTPC) += ltpc.o

drivers/staging/appletalk/cops.c→drivers/net/appletalk/cops.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */